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 13:58:57 UTC
svn commit: r509186 - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/impl/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/
cocoon-portal-impl/src/main/resources/org/apache/coc...
Author: cziegeler
Date: Mon Feb 19 04:58:55 2007
New Revision: 509186
URL: http://svn.apache.org/viewvc?view=rev&rev=509186
Log:
Migrate portal manager from avalon to spring
Modified:
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/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-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/spring/cocoon-portal-sample-components.xml
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=509186&r1=509185&r2=509186
==============================================================================
--- 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 19 04:58:55 2007
@@ -20,9 +20,6 @@
import java.util.List;
import java.util.Properties;
-import org.apache.avalon.framework.configuration.Configurable;
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.ajax.AjaxHelper;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -41,7 +38,7 @@
import org.apache.cocoon.portal.services.aspects.PortalManagerAspectRenderContext;
import org.apache.cocoon.portal.services.aspects.impl.support.PortalManagerAspectContextImpl;
import org.apache.cocoon.portal.services.aspects.support.AspectChain;
-import org.apache.cocoon.portal.util.AbstractComponent;
+import org.apache.cocoon.portal.util.AbstractBean;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.commons.lang.StringUtils;
@@ -53,21 +50,18 @@
* @version $Id: PortalManagerImpl.java 507453 2007-02-14 09:41:57Z cziegeler $
*/
public class DefaultPortalManager
- extends AbstractComponent
- implements PortalManager, PortalManagerAspect, Configurable {
+ extends AbstractBean
+ implements PortalManager, PortalManagerAspect {
+ /** The aspect chain for additional processing. */
protected AspectChain chain;
/**
- * @see org.apache.avalon.framework.activity.Disposable#dispose()
+ * Set the event chain.
+ * @param a A chain.
*/
- public void dispose() {
- if ( this.manager != null ) {
- if ( this.chain != null) {
- this.chain.dispose( this.manager );
- }
- }
- super.dispose();
+ public void setAspectChain(AspectChain a) {
+ this.chain = a;
}
/**
@@ -91,16 +85,14 @@
}
/**
- * @see org.apache.avalon.framework.configuration.Configurable#configure(org.apache.avalon.framework.configuration.Configuration)
+ * Initialize
*/
- public void configure(Configuration conf) throws ConfigurationException {
- try {
+ public void init()
+ throws PortalException {
+ if ( this.chain == null ) {
this.chain = new AspectChain(PortalManagerAspect.class);
- this.chain.configure(this.manager, conf);
- this.chain.addAspect(this, null);
- } catch (PortalException pe) {
- throw new ConfigurationException("Unable to configure portal manager aspects.", pe);
}
+ this.chain.addAspect(this, null);
}
/**
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=509186&r1=509185&r2=509186
==============================================================================
--- 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 19 04:58:55 2007
@@ -17,6 +17,9 @@
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.services.aspects.PortalManagerAspect;
+import org.apache.cocoon.portal.services.aspects.ProfileManagerAspect;
import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
/**
@@ -30,5 +33,8 @@
*/
public void init() {
this.registerBeanDefinitionParser("event-aspects", new AspectsBeanDefinitionParser(EventAspect.class.getName()));
+ this.registerBeanDefinitionParser("renderer-aspects", new AspectsBeanDefinitionParser(RendererAspect.class.getName()));
+ this.registerBeanDefinitionParser("portal-manager-aspects", new AspectsBeanDefinitionParser(PortalManagerAspect.class.getName()));
+ this.registerBeanDefinitionParser("profile-manager-aspects", new AspectsBeanDefinitionParser(ProfileManagerAspect.class.getName()));
}
}
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=509186&r1=509185&r2=509186
==============================================================================
--- 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 04:58:55 2007
@@ -39,6 +39,20 @@
</bean>
<!--+
+ | Portal Manager.
+ |
+ +-->
+ <bean name="org.apache.cocoon.portal.services.PortalManager"
+ 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"/>
+ </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 Converter.
|
+-->
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=509186&r1=509185&r2=509186
==============================================================================
--- 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 04:58:55 2007
@@ -177,14 +177,6 @@
shorthand="portal-service"/>
<!--+
- | Portal Manager.
- |
- +-->
- <role name="org.apache.cocoon.portal.services.PortalManager"
- default-class="org.apache.cocoon.portal.services.impl.DefaultPortalManager"
- shorthand="portal-manager"/>
-
- <!--+
| User Service.
|
+-->
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf?view=diff&rev=509186&r1=509185&r2=509186
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon/cocoon-portal-sample.xconf Mon Feb 19 04:58:55 2007
@@ -74,14 +74,6 @@
<parameter name="layout-user-save" value="cocoon:raw:/save-user-profile?profile=layout"/>
</portal-profile-manager>
- <!-- This is the portal manager.
- The portal manager can be extended with different aspects.
- -->
- <portal-manager>
- <aspects>
- </aspects>
- </portal-manager>
-
<!--+
| Deployment Manager.
+-->
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=509186&r1=509185&r2=509186
==============================================================================
--- 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 04:58:55 2007
@@ -62,4 +62,11 @@
<portal:aspect type="request-parameter"/>
</portal:event-aspects>
+ <!--+
+ | Portal Manager Aspect configuration.
+ |
+ +-->
+ <portal:portal-manager-aspects id="org.apache.cocoon.portal.services.PortalManager/aspects">
+ <!-- Add your aspects here -->
+ </portal:portal-manager-aspects>
</beans>