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 2007/02/26 11:40:47 UTC
svn commit: r511776 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/
cocoon-portal-impl/src/main/java/org/apache/cocoon/por...
Author: cziegeler
Date: Mon Feb 26 02:40:45 2007
New Revision: 511776
URL: http://svn.apache.org/viewvc?view=rev&rev=511776
Log:
Change from event aspects to more flexible request and response processor aspects.
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspect.java
- copied, changed from r511756, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspectContext.java
- copied, changed from r511746, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectRenderContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ResponseProcessorAspectContextImpl.java
- copied, changed from r511756, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPRequestProcessorAspect.java
- copied, changed from r511746, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
Removed:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/
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/services/aspects/PortalManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectRenderContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.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/impl/PortalServiceImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/PortalManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/ReceiverBeanPostProcessor.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/spring/schema/cocoon-portal-1.0.xsd
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/event/impl/DefaultEventManagerTestCase.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/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/EventManager.java Mon Feb 26 02:40:45 2007
@@ -16,7 +16,6 @@
*/
package org.apache.cocoon.portal.event;
-
/**
* This component manages the event handling mechanism in the portal.
* The event mechanism is based on the publisher/subscriber principle.
@@ -28,16 +27,6 @@
* @version $Id$
*/
public interface EventManager {
-
- /**
- * Represents the role of the service
- */
- String ROLE = EventManager.class.getName();
-
- /**
- * Process the events.
- */
- void processEvents();
/**
* Publish an event. All registered receivers get notified.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- 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 Mon Feb 26 02:40:45 2007
@@ -29,7 +29,6 @@
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.event.Receiver;
-import org.apache.cocoon.portal.services.aspects.support.AspectChain;
import org.apache.cocoon.portal.util.AbstractBean;
import org.springframework.core.OrderComparator;
import org.springframework.core.Ordered;
@@ -57,9 +56,6 @@
extends AbstractBean
implements EventManager {
- /** The aspect chain for additional event processing. */
- protected AspectChain chain;
-
/** Introspected receiver classes. */
protected Map receiverClasses = new HashMap();
@@ -74,14 +70,6 @@
}
/**
- * Set the event chain.
- * @param a A chain.
- */
- public void setAspectChain(AspectChain a) {
- this.chain = a;
- }
-
- /**
* Initialize this component.
*/
public void init() {
@@ -91,15 +79,6 @@
// TODO - Add this as a default bean!
// subscribe all receivers that are necessary for the portal to work
this.subscribe(new InternalEventReceiver());
- }
-
- /**
- * @see org.apache.cocoon.portal.event.EventManager#processEvents()
- */
- public void processEvents() {
- // now process event aspects
- DefaultEventAspectContext eventContext = new DefaultEventAspectContext(this.portalService, this.chain);
- eventContext.invokeNext();
}
/**
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?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- 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 Mon Feb 26 02:40:45 2007
@@ -63,8 +63,8 @@
public class PortalServiceImpl
extends AbstractLogEnabled
implements Serviceable,
- ThreadSafe,
- PortalService,
+ ThreadSafe,
+ PortalService,
ServletContextAware,
Disposable,
Configurable {
@@ -306,7 +306,7 @@
public EventManager getEventManager() {
if ( null == this.eventManager ) {
try {
- this.eventManager = (EventManager)this.manager.lookup( EventManager.ROLE );
+ this.eventManager = (EventManager)this.manager.lookup( EventManager.class.getName() );
} catch (ServiceException e) {
throw new PortalRuntimeException("Unable to lookup event manager.", e);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/PortalManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/PortalManager.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/PortalManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/PortalManager.java Mon Feb 26 02:40:45 2007
@@ -19,7 +19,8 @@
import java.util.Properties;
import org.apache.cocoon.portal.PortalException;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -65,5 +66,6 @@
Properties properties)
throws SAXException;
- void register(PortalManagerAspect aspect);
+ void register(ResponseProcessorAspect aspect);
+ void register(RequestProcessorAspect aspect);
}
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspect.java (from r511756, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspect.java?view=diff&rev=511776&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java&r1=511756&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspect.java&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspect.java Mon Feb 26 02:40:45 2007
@@ -22,12 +22,16 @@
import org.xml.sax.SAXException;
/**
+ * This aspect can be used to extend the portal manager functionality
+ * during the rendering phase, like preparing something before rendering
+ * etc.
+ *
* @version $Id$
*/
-public interface PortalManagerAspect extends RequestProcessorAspect {
+public interface ResponseProcessorAspect {
- void render(PortalManagerAspectRenderContext context,
- ContentHandler ch,
- Properties properties)
+ void render(ResponseProcessorAspectContext context,
+ ContentHandler ch,
+ Properties properties)
throws SAXException;
}
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspectContext.java (from r511746, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectRenderContext.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspectContext.java?view=diff&rev=511776&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectRenderContext.java&r1=511746&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspectContext.java&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectRenderContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/ResponseProcessorAspectContext.java Mon Feb 26 02:40:45 2007
@@ -22,14 +22,14 @@
import org.xml.sax.SAXException;
/**
- * @since 2.1.8
+ *
* @version $Id$
*/
-public interface PortalManagerAspectRenderContext
+public interface ResponseProcessorAspectContext
extends BasicAspectContext {
/**
- * Invoke next aspect
+ * Invoke next aspect
*/
void invokeNext(ContentHandler ch,
Properties parameters)
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java Mon Feb 26 02:40:45 2007
@@ -23,9 +23,8 @@
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.om.CopletInstanceFeatures;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
-import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -40,23 +39,15 @@
*/
public class PreloadPortalManagerAspect
extends AbstractBean
- implements PortalManagerAspect {
+ implements ResponseProcessorAspect {
/** Handler that simply ignores all sax events. */
protected static final ContentHandler nullHandler = new DefaultHandler();
/**
- * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
+ * @see org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect#render(org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext, org.xml.sax.ContentHandler, java.util.Properties)
*/
- public void process(RequestProcessorAspectContext context) {
- // let's just invoke the next
- context.invokeNext();
- }
-
- /**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#render(org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext, org.xml.sax.ContentHandler, java.util.Properties)
- */
- public void render(PortalManagerAspectRenderContext context,
+ public void render(ResponseProcessorAspectContext context,
ContentHandler ch,
Properties properties)
throws SAXException {
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ResponseProcessorAspectContextImpl.java (from r511756, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ResponseProcessorAspectContextImpl.java?view=diff&rev=511776&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java&r1=511756&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ResponseProcessorAspectContextImpl.java&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ResponseProcessorAspectContextImpl.java Mon Feb 26 02:40:45 2007
@@ -19,9 +19,8 @@
import java.util.Properties;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
-import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext;
import org.apache.cocoon.portal.services.aspects.support.AspectChain;
import org.apache.cocoon.portal.services.aspects.support.BasicAspectContextImpl;
import org.xml.sax.ContentHandler;
@@ -29,35 +28,25 @@
/**
* The aspect context is passed to every aspect.
- * @since 2.1.8
+ *
* @version $Id$
*/
-public final class PortalManagerAspectContextImpl
+public final class ResponseProcessorAspectContextImpl
extends BasicAspectContextImpl
- implements PortalManagerAspectRenderContext,
- RequestProcessorAspectContext {
+ implements ResponseProcessorAspectContext {
- public PortalManagerAspectContextImpl(PortalService service,
- AspectChain chain) {
+ public ResponseProcessorAspectContextImpl(PortalService service,
+ AspectChain chain) {
super(service, chain);
}
- /**
- * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext#invokeNext()
- */
- public void invokeNext() {
- final PortalManagerAspect aspect = (PortalManagerAspect)this.getNext();
- if ( aspect != null ) {
- aspect.process(this);
- }
- }
-
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext#invokeNext(org.xml.sax.ContentHandler, java.util.Properties)
+ * @see org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext#invokeNext(org.xml.sax.ContentHandler, java.util.Properties)
*/
- public void invokeNext(ContentHandler ch, Properties properties)
+ public void invokeNext(ContentHandler ch,
+ Properties properties)
throws SAXException {
- final PortalManagerAspect aspect = (PortalManagerAspect)this.getNext();
+ final ResponseProcessorAspect aspect = (ResponseProcessorAspect)this.getNext();
if ( aspect != null ) {
aspect.render(this, ch, properties);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/DefaultPortalManager.java Mon Feb 26 02:40:45 2007
@@ -24,7 +24,6 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.PortalException;
-import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.om.CopletInstanceFeatures;
@@ -33,10 +32,12 @@
import org.apache.cocoon.portal.om.LayoutFeatures;
import org.apache.cocoon.portal.profile.ProfileManager;
import org.apache.cocoon.portal.services.PortalManager;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
-import org.apache.cocoon.portal.services.aspects.impl.support.PortalManagerAspectContextImpl;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext;
+import org.apache.cocoon.portal.services.aspects.impl.support.RequestProcessorAspectContextImpl;
+import org.apache.cocoon.portal.services.aspects.impl.support.ResponseProcessorAspectContextImpl;
import org.apache.cocoon.portal.services.aspects.support.AspectChain;
import org.apache.cocoon.portal.util.AbstractBean;
import org.apache.cocoon.xml.AttributesImpl;
@@ -51,17 +52,28 @@
*/
public class DefaultPortalManager
extends AbstractBean
- implements PortalManager, PortalManagerAspect {
+ implements PortalManager, RequestProcessorAspect, ResponseProcessorAspect {
- /** The aspect chain for additional processing. */
- protected AspectChain chain;
+ /** The aspect chain for additional request processing. */
+ protected AspectChain requestChain;
+
+ /** The aspect chain for additional response processing. */
+ protected AspectChain responseChain;
/**
- * Set the event chain.
+ * Set the request aspect chain.
* @param a A chain.
*/
- public void setAspectChain(AspectChain a) {
- this.chain = a;
+ public void setRequestAspectChain(AspectChain a) {
+ this.requestChain = a;
+ }
+
+ /**
+ * Set the response aspect chain.
+ * @param a A chain.
+ */
+ public void setResponseAspectChain(AspectChain a) {
+ this.responseChain = a;
}
/**
@@ -69,8 +81,8 @@
*/
public void process()
throws PortalException {
- PortalManagerAspectContextImpl aspectContext =
- new PortalManagerAspectContextImpl(this.portalService, this.chain);
+ RequestProcessorAspectContextImpl aspectContext =
+ new RequestProcessorAspectContextImpl(this.portalService, this.requestChain);
aspectContext.invokeNext();
}
@@ -79,8 +91,8 @@
*/
public void render(ContentHandler contentHandler, Properties properties)
throws SAXException {
- PortalManagerAspectContextImpl aspectContext =
- new PortalManagerAspectContextImpl(this.portalService, this.chain);
+ ResponseProcessorAspectContextImpl aspectContext =
+ new ResponseProcessorAspectContextImpl(this.portalService, this.responseChain);
aspectContext.invokeNext(contentHandler, properties);
}
@@ -89,24 +101,27 @@
*/
public void init()
throws PortalException {
- if ( this.chain == null ) {
- this.chain = new AspectChain(PortalManagerAspect.class);
+ if ( this.requestChain == null ) {
+ this.requestChain = new AspectChain(RequestProcessorAspect.class);
+ }
+ this.requestChain.addAspect(this, null);
+ if ( this.responseChain == null ) {
+ this.responseChain = new AspectChain(ResponseProcessorAspect.class);
}
- this.chain.addAspect(this, null);
+ this.responseChain.addAspect(this, null);
}
/**
* @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
public void process(RequestProcessorAspectContext rpContext) {
- EventManager eventManager = this.portalService.getEventManager();
- eventManager.processEvents();
+ // by defaut, we have nothing to do
}
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#render(org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext, org.xml.sax.ContentHandler, java.util.Properties)
+ * @see org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect#render(org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext, org.xml.sax.ContentHandler, java.util.Properties)
*/
- public void render(PortalManagerAspectRenderContext renderContext,
+ public void render(ResponseProcessorAspectContext renderContext,
ContentHandler ch,
Properties properties)
throws SAXException {
@@ -207,11 +222,24 @@
}
/**
- * @see org.apache.cocoon.portal.services.PortalManager#register(org.apache.cocoon.portal.services.aspects.PortalManagerAspect)
+ * @see org.apache.cocoon.portal.services.PortalManager#register(org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect)
+ */
+ public void register(ResponseProcessorAspect aspect) {
+ try {
+ this.responseChain.addAspect(aspect, null, 0);
+ } catch (PortalException pe) {
+ final IllegalArgumentException e = new IllegalArgumentException("Unable to add portal manager aspects.");
+ e.initCause(pe);
+ throw e;
+ }
+ }
+
+ /**
+ * @see org.apache.cocoon.portal.services.PortalManager#register(org.apache.cocoon.portal.services.aspects.RequestProcessorAspect)
*/
- public void register(PortalManagerAspect aspect) {
+ public void register(RequestProcessorAspect aspect) {
try {
- this.chain.addAspect(aspect, null, 0);
+ this.responseChain.addAspect(aspect, null, 0);
} catch (PortalException pe) {
final IllegalArgumentException e = new IllegalArgumentException("Unable to add portal manager aspects.");
e.initCause(pe);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/PortalNamespaceHandler.java Mon Feb 26 02:40:45 2007
@@ -16,15 +16,15 @@
*/
package org.apache.cocoon.portal.spring;
-import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.support.RendererAspectChain;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
import org.apache.cocoon.portal.services.aspects.ProfileManagerAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
/**
- *
+ *
* @version $Id$
*/
public class PortalNamespaceHandler extends NamespaceHandlerSupport {
@@ -33,9 +33,9 @@
* @see org.springframework.beans.factory.xml.NamespaceHandler#init()
*/
public void init() {
- this.registerBeanDefinitionParser("event-aspects", new AspectsBeanDefinitionParser(EventAspect.class.getName()));
this.registerBeanDefinitionParser("renderer-aspects", new AspectsBeanDefinitionParser(RendererAspect.class.getName(), RendererAspectChain.class));
- this.registerBeanDefinitionParser("portal-manager-aspects", new AspectsBeanDefinitionParser(PortalManagerAspect.class.getName()));
+ this.registerBeanDefinitionParser("request-processor-aspects", new AspectsBeanDefinitionParser(RequestProcessorAspect.class.getName()));
+ this.registerBeanDefinitionParser("response-processor-aspects", new AspectsBeanDefinitionParser(ResponseProcessorAspect.class.getName()));
this.registerBeanDefinitionParser("profile-manager-aspects", new AspectsBeanDefinitionParser(ProfileManagerAspect.class.getName()));
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/ReceiverBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/ReceiverBeanPostProcessor.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/ReceiverBeanPostProcessor.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/ReceiverBeanPostProcessor.java Mon Feb 26 02:40:45 2007
@@ -46,7 +46,7 @@
*/
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if ( bean instanceof Receiver ) {
- ((EventManager)this.beanFactory.getBean(EventManager.ROLE)).subscribe((Receiver)bean);
+ ((EventManager)this.beanFactory.getBean(EventManager.class.getName())).subscribe((Receiver)bean);
}
return bean;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java Mon Feb 26 02:40:45 2007
@@ -18,7 +18,8 @@
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.BeanFactoryAware;
@@ -46,8 +47,11 @@
* @see org.springframework.beans.factory.config.BeanPostProcessor#postProcessAfterInitialization(java.lang.Object, java.lang.String)
*/
public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if ( bean instanceof CopletAdapter && bean instanceof PortalManagerAspect ) {
- ((PortalService)this.beanFactory.getBean(PortalService.class.getName())).getPortalManager().register((PortalManagerAspect)bean);
+ if ( bean instanceof CopletAdapter && bean instanceof ResponseProcessorAspect ) {
+ ((PortalService)this.beanFactory.getBean(PortalService.class.getName())).getPortalManager().register((ResponseProcessorAspect)bean);
+ }
+ if ( bean instanceof CopletAdapter && bean instanceof RequestProcessorAspect ) {
+ ((PortalService)this.beanFactory.getBean(PortalService.class.getName())).getPortalManager().register((RequestProcessorAspect)bean);
}
return bean;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/cocoon-portal-components.xml Mon Feb 26 02:40:45 2007
@@ -101,11 +101,18 @@
class="org.apache.cocoon.portal.services.impl.DefaultPortalManager"
parent="org.apache.cocoon.portal.util.AbstractBean"
init-method="init" scope="singleton">
- <property name="aspectChain" ref="org.apache.cocoon.portal.services.PortalManager.aspects"/>
+ <property name="requestAspectChain" ref="org.apache.cocoon.portal.services.PortalManager.requestAspects"/>
+ <property name="responseAspectChain" ref="org.apache.cocoon.portal.services.PortalManager.responseAspects"/>
</bean>
+ <!-- We register only the link service as a request processor. The aspect configuration
+ should be redefined in the portal config. -->
+ <portal:request-processor-aspects id="org.apache.cocoon.portal.services.PortalManager.requestAspects">
+ <portal:aspect ref="org.apache.cocoon.portal.services.LinkService"/>
+ </portal:request-processor-aspects>
+
<!-- We register an empty aspects bean which should be redefined in the portal config. -->
- <portal:event-aspects id="org.apache.cocoon.portal.services.PortalManager.aspects"/>
+ <portal:response-processor-aspects id="org.apache.cocoon.portal.services.PortalManager.responseAspects"/>
<!--+
| Portal Manager Aspects
@@ -142,45 +149,30 @@
<bean name="org.apache.cocoon.portal.event.EventManager"
class="org.apache.cocoon.portal.event.impl.DefaultEventManager"
parent="org.apache.cocoon.portal.util.AbstractBean"
- init-method="init" scope="singleton">
- <property name="aspectChain" ref="org.apache.cocoon.portal.event.EventManager.aspects"/>
- </bean>
-
- <!-- We register an empty aspects bean which should be redefined in the portal config. -->
- <portal:event-aspects id="org.apache.cocoon.portal.event.EventManager.aspects"/>
+ init-method="init" scope="singleton"/>
<!--+
- | Event Aspects
+ | Request Processor Aspects
|
+-->
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.action-counter"
- class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"
+ <bean id="org.apache.cocoon.portal.services.aspects.RequestProcessorAspect.action-counter"
+ class="org.apache.cocoon.portal.services.aspects.impl.ActionCounterRequestProcessorAspect"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.request-parameter"
- class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"
+ <bean id="org.apache.cocoon.portal.services.aspects.RequestProcessorAspect.frame"
+ class="org.apache.cocoon.portal.services.aspects.impl.FrameRequestProcessorAspect"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.frame"
- class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"
+ <bean id="org.apache.cocoon.portal.services.aspects.RequestProcessorAspect.link"
+ class="org.apache.cocoon.portal.services.aspects.impl.LinkRequestProcessorAspect"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.link"
- class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect"
- parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
-
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.page-label"
- class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"
- parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton">
- <property name="pageLabelManager" ref="org.apache.cocoon.portal.impl.PageLabelManager"/>
- </bean>
-
<!--+
| This aspect sets headers on the response telling the client to not cache
| the response.
+-->
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.no-client-caching"
- class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"
+ <bean id="org.apache.cocoon.portal.services.aspects.RequestProcessorAspect.no-client-caching"
+ class="org.apache.cocoon.portal.services.aspects.impl.NoClientCachingRequestProcessorAspect"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
@@ -225,7 +217,7 @@
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
<!-- We register an empty aspects bean which should be redefined in the portal config. -->
- <portal:event-aspects id="org.apache.cocoon.portal.profile.ProfileManager.aspects"/>
+ <portal:profile-manager-aspects id="org.apache.cocoon.portal.profile.ProfileManager.aspects"/>
<!--+
| Renderer map
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/spring/schema/cocoon-portal-1.0.xsd
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/spring/schema/cocoon-portal-1.0.xsd?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/spring/schema/cocoon-portal-1.0.xsd (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/spring/schema/cocoon-portal-1.0.xsd Mon Feb 26 02:40:45 2007
@@ -21,7 +21,7 @@
xmlns:tns="http://cocoon.apache.org/schema/portal"
xmlns="http://cocoon.apache.org/schema/portal">
- <xsd:element name="event-aspects">
+ <xsd:element name="renderer-aspects">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
@@ -31,7 +31,7 @@
</xsd:complexType>
</xsd:element>
- <xsd:element name="renderer-aspects">
+ <xsd:element name="profile-manager-aspects">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
@@ -41,7 +41,7 @@
</xsd:complexType>
</xsd:element>
- <xsd:element name="profile-manager-aspects">
+ <xsd:element name="request-processor-aspects">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
@@ -51,7 +51,7 @@
</xsd:complexType>
</xsd:element>
- <xsd:element name="portal-manager-aspects">
+ <xsd:element name="response-processor-aspects">
<xsd:complexType>
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/event/impl/DefaultEventManagerTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/event/impl/DefaultEventManagerTestCase.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/event/impl/DefaultEventManagerTestCase.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/event/impl/DefaultEventManagerTestCase.java Mon Feb 26 02:40:45 2007
@@ -26,7 +26,7 @@
import org.apache.cocoon.portal.event.Receiver;
/**
- * $Id$
+ * $Id$
*/
public class DefaultEventManagerTestCase extends AbstractPortalTestCase {
@@ -37,7 +37,7 @@
*/
protected void setUp() throws Exception {
super.setUp();
- this.eventManager = (DefaultEventManager)this.getBeanFactory().getBean(EventManager.ROLE);
+ this.eventManager = (DefaultEventManager)this.getBeanFactory().getBean(EventManager.class.getName());
}
/**
@@ -48,7 +48,7 @@
// Add event manager
final ComponentInfo component = new ComponentInfo();
component.setComponentClassName(DefaultEventManager.class.getName());
- component.setRole(EventManager.ROLE);
+ component.setRole(EventManager.class.getName());
component.setConfiguration(new DefaultConfiguration("-"));
info.addComponent(component);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Mon Feb 26 02:40:45 2007
@@ -52,8 +52,9 @@
import org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl;
import org.apache.cocoon.portal.pluto.servlet.ServletRequestImpl;
import org.apache.cocoon.portal.pluto.servlet.ServletResponseImpl;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
-import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext;
import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.HtmlSaxParser;
import org.apache.pluto.PortletContainer;
@@ -81,7 +82,7 @@
*/
public class PortletAdapter
extends AbstractCopletAdapter
- implements PortalManagerAspect, CopletDecorationProvider, Receiver, Parameterizable {
+ implements RequestProcessorAspect, ResponseProcessorAspect, CopletDecorationProvider, Receiver, Parameterizable {
/** Name of the temporary coplet instance attribute holding the portlet window. */
public static final String PORTLET_WINDOW_ATTRIBUTE_NAME = PortletAdapter.class.getName() + "/window";
@@ -388,9 +389,9 @@
}
/**
- * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#render(org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext, org.xml.sax.ContentHandler, java.util.Properties)
+ * @see org.apache.cocoon.portal.services.aspects.ResponseProcessorAspect#render(org.apache.cocoon.portal.services.aspects.ResponseProcessorAspectContext, org.xml.sax.ContentHandler, java.util.Properties)
*/
- public void render(PortalManagerAspectRenderContext aspectContext,
+ public void render(ResponseProcessorAspectContext aspectContext,
ContentHandler ch,
Properties properties)
throws SAXException {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml Mon Feb 26 02:40:45 2007
@@ -74,10 +74,11 @@
</bean>
<!--+
- | Event Manager Aspect configuration.
+ | Request Processor Aspect configuration.
|
+-->
- <portal:event-aspects id="org.apache.cocoon.portal.event.EventManager.aspects">
+ <portal:request-processor-aspects id="org.apache.cocoon.portal.services.PortalManager.requestAspects">
+ <portal:aspect ref="org.apache.cocoon.portal.services.LinkService"/>
<!-- The client should not cache the page. -->
<portal:aspect type="no-client-caching"/>
<!-- Use the action counter with great care. We recommend turning it off. -->
@@ -90,16 +91,15 @@
-->
<!-- Comment the following out if you don't need WSRP: -->
<portal:aspect type="wsrp"/>
- <portal:aspect type="request-parameter"/>
- </portal:event-aspects>
+ </portal:request-processor-aspects>
<!--+
- | Portal Manager Aspect configuration.
+ | Response Processor Aspect configuration.
|
+-->
- <portal:portal-manager-aspects id="org.apache.cocoon.portal.services.PortalManager.aspects">
+ <portal:response-processor-aspects id="org.apache.cocoon.portal.services.PortalManager.responseAspects">
<!-- Add your aspects here -->
- </portal:portal-manager-aspects>
+ </portal:response-processor-aspects>
<!--+
| Profile Manager Aspect configuration.
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPRequestProcessorAspect.java (from r511746, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPRequestProcessorAspect.java?view=diff&rev=511776&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java&r1=511746&p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPRequestProcessorAspect.java&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPRequestProcessorAspect.java Mon Feb 26 02:40:45 2007
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,26 +23,27 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.event.Event;
-import org.apache.cocoon.portal.event.aspect.EventAspect;
-import org.apache.cocoon.portal.event.aspect.EventAspectContext;
import org.apache.cocoon.portal.om.CopletInstance;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspect;
+import org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext;
import org.apache.cocoon.portal.util.AbstractBean;
/**
- * This event processes all wsrp related urls and fires {@link org.apache.cocoon.portal.wsrp.adapter.WSRPEvent}s.
+ * This aspect processes all wsrp related urls and fires
+ * {@link org.apache.cocoon.portal.wsrp.adapter.WSRPEvent}s.
*
* @version $Id$
*/
-public class WSRPEventAspect
+public class WSRPRequestProcessorAspect
extends AbstractBean
- implements EventAspect {
+ implements RequestProcessorAspect {
public static final String REQUEST_PARAMETER_NAME = "cocoon-wsrpevent";
/**
- * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
+ * @see org.apache.cocoon.portal.services.aspects.RequestProcessorAspect#process(org.apache.cocoon.portal.services.aspects.RequestProcessorAspectContext)
*/
- public void process(EventAspectContext context) {
+ public void process(RequestProcessorAspectContext context) {
final Request request = ObjectModelHelper.getRequest(context.getPortalService().getProcessInfoProvider().getObjectModel());
final String[] values = request.getParameterValues("cocoon-wsrpevent");
if ( values != null && values.length == 1 ) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java Mon Feb 26 02:40:45 2007
@@ -23,7 +23,7 @@
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.om.CopletInstance;
import org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter;
-import org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect;
+import org.apache.cocoon.portal.wsrp.adapter.WSRPRequestProcessorAspect;
import org.apache.wsrp4j.consumer.URLGenerator;
import org.apache.wsrp4j.util.Constants;
@@ -115,7 +115,7 @@
secureLink = Boolean.TRUE;
}
final CopletInstance coplet = this.adapter.getCurrentCopletInstanceData();
- params.put(WSRPEventAspect.REQUEST_PARAMETER_NAME, coplet.getId());
+ params.put(WSRPRequestProcessorAspect.REQUEST_PARAMETER_NAME, coplet.getId());
final StringBuffer buffer = new StringBuffer(this.service.getLinkService().getRefreshLinkURI(secureLink));
boolean hasParams = buffer.indexOf("?") > 0;
Iterator i = params.entrySet().iterator();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml?view=diff&rev=511776&r1=511775&r2=511776
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml Mon Feb 26 02:40:45 2007
@@ -29,14 +29,14 @@
http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
<!--+
- | Event Aspects
+ | Request Processor Aspects
|
+-->
<!--+
| This aspect is required for WSRP.
+-->
- <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.wsrp"
- class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"
+ <bean id="org.apache.cocoon.portal.services.aspects.RequestProcessorAspect.wsrp"
+ class="org.apache.cocoon.portal.wsrp.adapter.WSRPRequestProcessorAspect"
parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
</beans>