cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r509573 - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/ cocoon-portal-sample/src/main/resource...
Date Tue, 20 Feb 2007 14:20:23 GMT
Author: cziegeler
Date: Tue Feb 20 06:20:22 2007
New Revision: 509573

URL: http://svn.apache.org/viewvc?view=rev&rev=509573
Log:
Fix bug in profile manager aspect handling
Add page label aspect

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.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-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/aspects/impl/support/ProfileManagerAspectContextImpl.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/ProfileManagerAspectContextImpl.java?view=diff&rev=509573&r1=509572&r2=509573
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/ProfileManagerAspectContextImpl.java
Tue Feb 20 06:20:22 2007
@@ -40,13 +40,14 @@
     public static final int PHASE_COPLET_INSTANCES =2;
     public static final int PHASE_COPLET_LAYOUT = 3;
 
-    protected int phase;
+    protected final int phase;
     protected Object result;
 
     public ProfileManagerAspectContextImpl(PortalService service,
                                            AspectChain   chain,
                                            int           phase) {
         super(service, chain);
+        this.phase = phase;
     }
 
 	public void invokeNext(Object object) {

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=509573&r1=509572&r2=509573
==============================================================================
--- 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
Tue Feb 20 06:20:22 2007
@@ -215,6 +215,15 @@
       | Profile Manager.
       |
       +-->
+
+  <!--+
+      | Profile Manager Aspects.
+      |
+      +-->
+    <bean name="org.apache.cocoon.portal.services.aspects.ProfileManagerAspect.page-labels"
+          class="org.apache.cocoon.portal.services.aspects.impl.PageLabelProfileManagerAspect"
+          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"/>
 

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=509573&r1=509572&r2=509573
==============================================================================
--- 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
Tue Feb 20 06:20:22 2007
@@ -106,6 +106,7 @@
       |
       +-->
     <portal:profile-manager-aspects id="org.apache.cocoon.portal.profile.ProfileManager.aspects">
+      <portal:aspect type="page-labels"/>
       <!-- Add your aspects here -->
     </portal:profile-manager-aspects>
 </beans>



Mime
View raw message