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/19 14:45:48 UTC
svn commit: r509201 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/
cocoon-portal-impl/src/main/java/...
Author: cziegeler
Date: Mon Feb 19 05:45:47 2007
New Revision: 509201
URL: http://svn.apache.org/viewvc?view=rev&rev=509201
Log:
Migrate event aspects and portal manager aspects from avalon to spring.
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml (with props)
Modified:
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/services/aspects/impl/PreloadPortalManagerAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.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/portal.roles
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-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/adapter/WSRPEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/portal-wsrp.roles
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?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- 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 Mon Feb 19 05:45:47 2007
@@ -18,10 +18,6 @@
import java.util.StringTokenizer;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.PortalService;
@@ -31,24 +27,15 @@
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
import org.apache.cocoon.portal.om.Layout;
import org.apache.cocoon.portal.om.LayoutException;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
/**
*
* @version $Id$
*/
public abstract class AbstractContentEventAspect
- extends AbstractLogEnabled
- implements EventAspect, ThreadSafe, Serviceable {
-
- protected ServiceManager manager;
-
- /**
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
- */
- public void service(ServiceManager aManager) throws ServiceException {
- this.manager = aManager;
- }
+ extends AbstractBean
+ implements EventAspect {
protected abstract String getRequestParameterName(EventAspectContext context);
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?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- 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 Mon Feb 19 05:45:47 2007
@@ -16,16 +16,12 @@
*/
package org.apache.cocoon.portal.event.aspect.impl;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameterizable;
-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;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
/**
* This aspect "disables" the back button of the browser and tries to avoid
@@ -39,15 +35,13 @@
* @version $Id$
*/
public class ActionCounterEventAspect
- extends AbstractLogEnabled
- implements EventAspect,
- ThreadSafe,
- Parameterizable {
+ extends AbstractBean
+ implements EventAspect {
protected final static String ATTRIBUTE_NAME = ActionCounterEventAspect.class.getName();
/** The name of the parameter to check */
- protected String parameterName;
+ protected String parameterName = "cocoon-portal-action";
/**
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
@@ -92,11 +86,7 @@
response.setHeader("Expires", "Thu, 01 Jan 2000 00:00:00 GMT");
}
- /**
- * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
- */
- public void parameterize(Parameters parameters)
- throws ParameterException {
- this.parameterName = parameters.getParameter("parameter-name", "cocoon-portal-action");
+ public void setParameterName(String value) {
+ this.parameterName = value;
}
}
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?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- 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 Mon Feb 19 05:45:47 2007
@@ -16,12 +16,11 @@
*/
package org.apache.cocoon.portal.event.aspect.impl;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Response;
import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
/**
* This aspect implementation sets some headers on the response that tell
@@ -31,9 +30,8 @@
* @version $Id$
*/
public class NoClientCachingEventAspect
- extends AbstractLogEnabled
- implements EventAspect,
- ThreadSafe {
+ extends AbstractBean
+ implements EventAspect {
/**
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
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?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- 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 Mon Feb 19 05:45:47 2007
@@ -18,19 +18,14 @@
import java.util.Iterator;
-import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.impl.PageLabelManager;
+import org.apache.cocoon.portal.util.AbstractBean;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
-import org.apache.cocoon.util.AbstractLogEnabled;
/**
* Converts links generated by the PageLabelLinkService into events and publishes them.
@@ -40,35 +35,16 @@
* @version $Id$
*/
public class PageLabelEventAspect
- extends AbstractLogEnabled
- implements EventAspect, ThreadSafe, Serviceable, Disposable {
-
- protected ServiceManager manager;
+ extends AbstractBean
+ implements EventAspect {
protected PageLabelManager labelManager;
- /**
- * @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.labelManager = (PageLabelManager)this.manager.lookup(PageLabelManager.ROLE);
+ public void setPageLabelManager(PageLabelManager plm) {
+ this.labelManager = plm;
}
/**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
- */
- public void dispose() {
- if (this.manager != null) {
- if (this.labelManager != null) {
- this.manager.release(this.labelManager);
- this.labelManager = null;
- }
- this.manager = null;
- }
- }
-
- /**
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext)
*/
public void process(EventAspectContext context) {
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?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- 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 Mon Feb 19 05:45:47 2007
@@ -19,7 +19,6 @@
import java.util.StringTokenizer;
import java.util.List;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.event.Event;
@@ -27,15 +26,15 @@
import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.event.aspect.EventAspectContext;
import org.apache.cocoon.portal.services.LinkService;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
/**
*
* @version $Id$
*/
public class RequestParameterEventAspect
- extends AbstractLogEnabled
- implements EventAspect, ThreadSafe {
+ extends AbstractBean
+ implements EventAspect {
protected void process(EventAspectContext context,
Request request,
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=509201&r1=509200&r2=509201
==============================================================================
--- 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 19 05:45:47 2007
@@ -27,7 +27,7 @@
import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
-import org.apache.cocoon.util.AbstractLogEnabled;
+import org.apache.cocoon.portal.util.AbstractBean;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -40,7 +40,7 @@
* @version $Id$
*/
public class PreloadPortalManagerAspect
- extends AbstractLogEnabled
+ extends AbstractBean
implements PortalManagerAspect {
/** Handler that simply ignores all sax events. */
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/AspectsBeanDefinitionParser.java Mon Feb 19 05:45:47 2007
@@ -67,7 +67,7 @@
if ( ref != null && type != null ) {
throw new BeanDefinitionStoreException("Element 'aspect' must have either a 'ref' or a 'type' attribute, but not both.");
}
- final String beanName = (ref != null ? ref : this.baseClass + '/' + type);
+ final String beanName = (ref != null ? ref : this.baseClass + '.' + type);
aspectBeans.add(new RuntimeBeanReference(beanName));
// properties
final Properties props = new Properties();
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=509201&r1=509200&r2=509201
==============================================================================
--- 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 19 05:45:47 2007
@@ -46,11 +46,20 @@
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="aspectChain" ref="org.apache.cocoon.portal.services.PortalManager.aspects"/>
</bean>
<!-- 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:event-aspects id="org.apache.cocoon.portal.services.PortalManager.aspects"/>
+
+ <!--+
+ | Portal Manager Aspects
+ |
+ +-->
+ <!-- Legacy service selector. -->
+ <bean id="org.apache.cocoon.portal.services.aspects.PortalManagerAspect.preload"
+ class="org.apache.cocoon.portal.services.aspects.impl.PreloadPortalManagerAspect"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
<!--+
| Portal Event Converter.
@@ -79,11 +88,44 @@
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"/>
+ <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"/>
+ <portal:event-aspects id="org.apache.cocoon.portal.event.EventManager.aspects"/>
+
+ <!--+
+ | Event Aspects
+ |
+ +-->
+ <bean id="org.apache.cocoon.portal.event.aspect.EventAspect.action-counter"
+ class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"
+ 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"
+ 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"
+ 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"/>
+
+ <!--+
+ | 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"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
<!--+
| Portal Link Service.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles Mon Feb 19 05:45:47 2007
@@ -25,48 +25,6 @@
<role name="org.apache.cocoon.portal.spring.RegistrationBeanPostProcessor"
default-class="org.apache.cocoon.portal.spring.RegistrationBeanPostProcessor"/>
- <!--+
- | Event Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.event.aspect.EventAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/action-counter"
- default-class="org.apache.cocoon.portal.event.aspect.impl.ActionCounterEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/request-parameter"
- default-class="org.apache.cocoon.portal.event.aspect.impl.RequestParameterEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/frame"
- default-class="org.apache.cocoon.portal.event.aspect.impl.FrameEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/link"
- default-class="org.apache.cocoon.portal.event.aspect.impl.LinkEventAspect"/>
-
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/page-label"
- default-class="org.apache.cocoon.portal.event.aspect.impl.PageLabelEventAspect"/>
-
- <!--+
- | This aspect sets headers on the response telling the client to not cache
- | the response.
- +-->
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/no-client-caching"
- default-class="org.apache.cocoon.portal.event.aspect.impl.NoClientCachingEventAspect"/>
-
-
- <!--+
- | Portal Manager Aspects
- |
- +-->
- <!-- Legacy service selector. -->
- <role name="org.apache.cocoon.portal.PortalManagerAspectSelector"
- default-class="org.apache.cocoon.core.container.DefaultServiceSelector"/>
-
- <role name="org.apache.cocoon.portal.services.aspects.PortalManagerAspect/preload"
- default-class="org.apache.cocoon.portal.services.aspects.impl.PreloadPortalManagerAspect"/>
-
<!--+
| Renderer
|
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=509201&r1=509200&r2=509201
==============================================================================
--- 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 19 05:45:47 2007
@@ -26,7 +26,7 @@
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:string" use="optional"/>
+ <xsd:attribute name="id" type="xsd:ID" use="optional"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
</xsd:complexType>
</xsd:element>
@@ -36,7 +36,7 @@
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:string" use="optional"/>
+ <xsd:attribute name="id" type="xsd:ID" use="optional"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
</xsd:complexType>
</xsd:element>
@@ -46,7 +46,7 @@
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:string" use="optional"/>
+ <xsd:attribute name="id" type="xsd:ID" use="optional"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
</xsd:complexType>
</xsd:element>
@@ -56,7 +56,7 @@
<xsd:sequence>
<xsd:element ref="aspect" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
- <xsd:attribute name="id" type="xsd:string" use="optional"/>
+ <xsd:attribute name="id" type="xsd:ID" use="optional"/>
<xsd:attribute name="name" type="xsd:string" use="optional"/>
</xsd:complexType>
</xsd:element>
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=509201&r1=509200&r2=509201
==============================================================================
--- 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 19 05:45:47 2007
@@ -30,6 +30,9 @@
<!-- Include default beans -->
<import resource="classpath:org/apache/cocoon/portal/cocoon-portal-components.xml"/>
+ <!-- If you don't need WSRP support, you can remove the following include -->
+ <import resource="classpath:org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml"/>
+
<!--+
| Portal Link Service.
|
@@ -46,7 +49,7 @@
| Event Manager Aspect configuration.
|
+-->
- <portal:event-aspects id="org.apache.cocoon.portal.event.EventManager/aspects">
+ <portal:event-aspects id="org.apache.cocoon.portal.event.EventManager.aspects">
<!-- 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. -->
@@ -66,7 +69,7 @@
| Portal Manager Aspect configuration.
|
+-->
- <portal:portal-manager-aspects id="org.apache.cocoon.portal.services.PortalManager/aspects">
+ <portal:portal-manager-aspects id="org.apache.cocoon.portal.services.PortalManager.aspects">
<!-- Add your aspects here -->
</portal:portal-manager-aspects>
</beans>
Modified: 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/WSRPEventAspect.java?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- 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/WSRPEventAspect.java Mon Feb 19 05:45:47 2007
@@ -20,20 +20,22 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.thread.ThreadSafe;
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.util.AbstractBean;
/**
* This event processes all wsrp related urls and fires {@link org.apache.cocoon.portal.wsrp.adapter.WSRPEvent}s.
*
* @version $Id$
*/
-public class WSRPEventAspect implements EventAspect, ThreadSafe {
+public class WSRPEventAspect
+ extends AbstractBean
+ implements EventAspect {
public static final String REQUEST_PARAMETER_NAME = "cocoon-wsrpevent";
Added: 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=auto&rev=509201
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml Mon Feb 19 05:45:47 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ 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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--+
+ | This is the default configuration for the portal beans.
+ |
+ | @version $Id$
+ +-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:portal="http://cocoon.apache.org/schema/portal"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://cocoon.apache.org/schema/portal http://cocoon.apache.org/schema/portal/cocoon-portal-1.0.xsd">
+
+ <!--+
+ | Event 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"
+ parent="org.apache.cocoon.portal.util.AbstractBean" scope="singleton"/>
+
+</beans>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/cocoon-portal-wsrp-components.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/portal-wsrp.roles
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/portal-wsrp.roles?view=diff&rev=509201&r1=509200&r2=509201
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/portal-wsrp.roles (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/resources/org/apache/cocoon/portal/wsrp/portal-wsrp.roles Mon Feb 19 05:45:47 2007
@@ -18,17 +18,6 @@
<!-- $Id$ -->
<role-list>
- <!--+
- | Event Aspects
- |
- +-->
- <!--+
- | This aspect is required for WSRP.
- +-->
- <role name="org.apache.cocoon.portal.event.aspect.EventAspect/wsrp"
- default-class="org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect"/>
-
-
<!--+
| Default User Context Provider for WSRP.
+-->