cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl AbstractContentEventAspect.java FrameEventAspect.java LinkEventAspect.java
Date Mon, 14 Jul 2003 10:12:14 GMT
cziegeler    2003/07/14 03:12:14

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl
                        FrameEventAspect.java LinkEventAspect.java
  Added:       src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl
                        AbstractContentEventAspect.java
  Log:
  Unify code base
  
  Revision  Changes    Path
  1.8       +20 -97    cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java
  
  Index: FrameEventAspect.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/FrameEventAspect.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FrameEventAspect.java	10 Jul 2003 13:17:03 -0000	1.7
  +++ FrameEventAspect.java	14 Jul 2003 10:12:13 -0000	1.8
  @@ -50,24 +50,11 @@
   */
   package org.apache.cocoon.portal.event.aspect.impl;
   
  -import java.util.StringTokenizer;
  -
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -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;
   import org.apache.cocoon.portal.event.Event;
   import org.apache.cocoon.portal.event.Publisher;
  -import org.apache.cocoon.portal.event.aspect.EventAspect;
  -import org.apache.cocoon.portal.event.aspect.EventAspectContext;
   import org.apache.cocoon.portal.event.impl.ChangeAspectDataEvent;
   import org.apache.cocoon.portal.layout.Layout;
   import org.apache.cocoon.portal.layout.impl.FrameLayout;
  -import org.apache.cocoon.portal.profile.ProfileManager;
   
   /**
    *
  @@ -77,96 +64,32 @@
    * 
    * @version CVS $Id$
    */
  -public class FrameEventAspect
  -    extends AbstractLogEnabled
  -    implements EventAspect, ThreadSafe, Composable {
  -
  -    protected ComponentManager manager;
  +public class FrameEventAspect extends AbstractContentEventAspect {
   
  -    /* (non-Javadoc)
  -     * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext,
org.apache.cocoon.portal.PortalService)
  -     */
  -    public void process(EventAspectContext context, PortalService service) {
  +    protected String getRequestParameterName() {
           // TODO - make this configurable
  -        final String requestParameterName = "frame";
  -        final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
  -        String[] values = request.getParameterValues(requestParameterName);
  -        if (values != null) {
  -            final Publisher publisher = context.getEventPublisher();
  -            for (int i = 0; i < values.length; i++) {
  -                final String value = values[i];
  -                Event e = null;
  -                try {
  -                    e = context.getEventConverter().decode(value);
  -                    if (null != e) {
  -                        publisher.publish(e);
  -                    }
  -                } catch (Exception ignore) {
  -                }
  -                if (e == null) {
  -                    // Use '|' character as delimiter between Group, ID and URI
  -					StringTokenizer tokenizer = new StringTokenizer(value, "|");
  -					int tokenNumber = 0;
  -					int tokenCount = tokenizer.countTokens();
  -					// if only 3 params are in the String
  -					if (tokenCount == 2)
  -						tokenNumber = tokenNumber + 1;
  +        return "frame";
  +    }
   
  -					String groupKey = null;
  -					String id = null;
  -                        String uri = null;
  -										
  -					while (tokenizer.hasMoreTokens())
  -					{
  -                        	
  -						switch (tokenNumber)
  -						{
  -							case 0 :
  -								groupKey = tokenizer.nextToken();
  -								break;
  -							case 1 :
  -								id = tokenizer.nextToken();
  -								break;
  -							case 2 :
  -								uri = tokenizer.nextToken();
  -								break;
  -                        }
  -                        
  -						tokenNumber = tokenNumber + 1;
  -					} // while
  -                    
  -					if (tokenCount > 0) {                                            					        
               
  -                        ProfileManager profileManager = null;
  -                        try {
  -                            profileManager = (ProfileManager)this.manager.lookup(ProfileManager.ROLE);
  -                            Layout layout = profileManager.getPortalLayout(groupKey, id
);
  -                            if ( layout != null ) {
  -								if (layout instanceof FrameLayout){
  -                                e = new ChangeAspectDataEvent(layout, "frame", uri);
  -                                publisher.publish(e);
  -								} else {
  -									this.getLogger().warn("the configured layout: " + layout.getName() + " is not
a FrameLayout.");
  -                            }
  -                            }
  -                        } catch (ComponentException ignore) {
  -                        } finally {
  -                            this.manager.release( profileManager );
  -                        }
  -					} else {
  -						this.getLogger().warn("data for LinkEvent is not set correctly");
  -                    }
  -                }
  -            }
  -        }
  -        // and invoke next one
  -        context.invokeNext(service);
  +    protected int getRequiredValueCount() {
  +        return 3;
       }
   
       /* (non-Javadoc)
  -     * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
  +     * @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#publish(org.apache.cocoon.portal.event.Publisher,
org.apache.cocoon.portal.layout.Layout, java.lang.String[])
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  -        this.manager = manager;
  +    protected void publish(Publisher publisher,
  +                             Layout layout,
  +                             String[] values) {
  +        if (layout instanceof FrameLayout) {
  +            final Event e = new ChangeAspectDataEvent(layout, "frame", values[2]);
  +            publisher.publish(e);
  +        } else {
  +            this.getLogger().warn(
  +                "the configured layout: "
  +                    + layout.getName()
  +                    + " is not a FrameLayout.");
  +        }
       }
   
   }
  
  
  
  1.2       +27 -104   cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java
  
  Index: LinkEventAspect.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/LinkEventAspect.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LinkEventAspect.java	10 Jul 2003 13:17:03 -0000	1.1
  +++ LinkEventAspect.java	14 Jul 2003 10:12:14 -0000	1.2
  @@ -50,24 +50,11 @@
   */
   package org.apache.cocoon.portal.event.aspect.impl;
   
  -import java.util.StringTokenizer;
  -
  -import org.apache.avalon.framework.component.ComponentException;
  -import org.apache.avalon.framework.component.ComponentManager;
  -import org.apache.avalon.framework.component.Composable;
  -import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -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;
   import org.apache.cocoon.portal.event.Event;
   import org.apache.cocoon.portal.event.Publisher;
  -import org.apache.cocoon.portal.event.aspect.EventAspect;
  -import org.apache.cocoon.portal.event.aspect.EventAspectContext;
   import org.apache.cocoon.portal.event.impl.ChangeAspectDataEvent;
   import org.apache.cocoon.portal.layout.Layout;
   import org.apache.cocoon.portal.layout.impl.LinkLayout;
  -import org.apache.cocoon.portal.profile.ProfileManager;
   
   /**
    *
  @@ -75,103 +62,39 @@
    * 
    * @version CVS $Id$
    */
  -public class LinkEventAspect
  -    extends AbstractLogEnabled
  -    implements EventAspect, ThreadSafe, Composable {
  -
  -    protected ComponentManager manager;
  +public class LinkEventAspect extends AbstractContentEventAspect {
   
  -    /* (non-Javadoc)
  -     * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext,
org.apache.cocoon.portal.PortalService)
  -     */
  -    public void process(EventAspectContext context, PortalService service) {
  +    protected String getRequestParameterName() {
           // TODO - make this configurable
  -        final String requestParameterName = "link";
  -        final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
  -        String[] values = request.getParameterValues(requestParameterName);
  -        if (values != null) {
  -            final Publisher publisher = context.getEventPublisher();
  -            for (int i = 0; i < values.length; i++) {
  -                final String value = values[i];
  -                Event e = null;
  -                try {
  -                    e = context.getEventConverter().decode(value);
  -                    if (null != e) {
  -                        publisher.publish(e);
  -                    }
  -                } catch (Exception ignore) {
  -                }
  -                if (e == null) {
  -                    // Use '|' character as delimiter between targetGroup, targetId, contentGroup
and contentId
  -                    StringTokenizer tokenizer = new StringTokenizer(value, "|");
  -                    int tokenNumber = 0;
  -                    int tokenCount = tokenizer.countTokens();
  -					// if only 3 params are in the String
  -					if (tokenCount == 3)
  -						tokenNumber = tokenNumber + 1;
  +        return "link";
  +    }
   
  -					String targetGroup = null;
  -					String targetId = null;
  -					String contentGroup = null;
  -					String contentId = null;
  -					
  -                    while (tokenizer.hasMoreTokens())
  -                    {
  -                        	
  -                    	switch (tokenNumber)
  -                        {
  -                            case 0 :
  -								targetGroup = tokenizer.nextToken();
  -                                break;
  -							case 1 :
  -								targetId = tokenizer.nextToken();
  -								break;
  -							case 2 :
  -								contentGroup = tokenizer.nextToken();
  -								break;
  -							case 3 :
  -								contentId = tokenizer.nextToken();
  -								break;
  -                        }
  -                        
  -						tokenNumber = tokenNumber + 1;
  -                    } // while
  -                    
  -					if (tokenCount > 0) {                                            
  -                        ProfileManager profileManager = null;
  -                        try {
  -                            profileManager = (ProfileManager)this.manager.lookup(ProfileManager.ROLE);
  -							Layout layout = profileManager.getPortalLayout(targetGroup, targetId );
  -                            if ( layout != null ) {
  -                            	if (layout instanceof LinkLayout){
  -									LinkLayout linkLayout = (LinkLayout)layout;
  -									e = new ChangeAspectDataEvent(linkLayout, "link-layout-key", contentGroup);
  -									publisher.publish(e);	
  -                                    e = new ChangeAspectDataEvent(linkLayout, "link-layout-id",
contentId);
  -                                    publisher.publish(e);   
  -                            	} else {
  -									this.getLogger().warn("the configured layout: " + layout.getName() + " is not
a linkLayout.");
  -                            	}								
  -                            }
  -                        } catch (ComponentException ignore) {
  -                        } finally {
  -                            this.manager.release( profileManager );
  -                        }
  -                    } else {
  -                    	this.getLogger().warn("data for LinkEvent is not set correctly");
  -                    }
  -                }
  -            }
  -        }
  -        // and invoke next one
  -        context.invokeNext(service);
  +    protected int getRequiredValueCount() {
  +        return 4;
       }
   
       /* (non-Javadoc)
  -     * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
  +     * @see org.apache.cocoon.portal.event.aspect.impl.AbstractContentEventAspect#publish(org.apache.cocoon.portal.event.Publisher,
org.apache.cocoon.portal.layout.Layout, java.lang.String[])
        */
  -    public void compose(ComponentManager manager) throws ComponentException {
  -        this.manager = manager;
  +    protected void publish(Publisher publisher,
  +                             Layout layout,
  +                              String[] values) {
  +        if (layout instanceof LinkLayout) {
  +            LinkLayout linkLayout = (LinkLayout) layout;
  +            Event e = new ChangeAspectDataEvent(linkLayout,
  +                                                "link-layout-key",
  +                                                values[2]);
  +            publisher.publish(e);
  +            e = new ChangeAspectDataEvent(linkLayout,
  +                                          "link-layout-id",
  +                                          values[3]);
  +            publisher.publish(e);
  +        } else {
  +            this.getLogger().warn(
  +                "the configured layout: "
  +                    + layout.getName()
  +                    + " is not a LinkLayout.");
  +        }
       }
   
   }
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
  
  Index: AbstractContentEventAspect.java
  ===================================================================
  /*
  
   ============================================================================
                     The Apache Software License, Version 1.1
   ============================================================================
  
   Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
  
   Redistribution and use in source and binary forms, with or without modifica-
   tion, are permitted provided that the following conditions are met:
  
   1. Redistributions of  source code must  retain the above copyright  notice,
      this list of conditions and the following disclaimer.
  
   2. Redistributions in binary form must reproduce the above copyright notice,
      this list of conditions and the following disclaimer in the documentation
      and/or other materials provided with the distribution.
  
   3. The end-user documentation included with the redistribution, if any, must
      include  the following  acknowledgment:  "This product includes  software
      developed  by the  Apache Software Foundation  (http://www.apache.org/)."
      Alternately, this  acknowledgment may  appear in the software itself,  if
      and wherever such third-party acknowledgments normally appear.
  
   4. The names "Apache Cocoon" and  "Apache Software Foundation" must  not  be
      used to  endorse or promote  products derived from  this software without
      prior written permission. For written permission, please contact
      apache@apache.org.
  
   5. Products  derived from this software may not  be called "Apache", nor may
      "Apache" appear  in their name,  without prior written permission  of the
      Apache Software Foundation.
  
   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   FITNESS  FOR A PARTICULAR  PURPOSE ARE  DISCLAIMED.  IN NO  EVENT SHALL  THE
   APACHE SOFTWARE  FOUNDATION  OR ITS CONTRIBUTORS  BE LIABLE FOR  ANY DIRECT,
   INDIRECT, INCIDENTAL, SPECIAL,  EXEMPLARY, OR CONSEQUENTIAL  DAMAGES (INCLU-
   DING, BUT NOT LIMITED TO, PROCUREMENT  OF SUBSTITUTE GOODS OR SERVICES; LOSS
   OF USE, DATA, OR  PROFITS; OR BUSINESS  INTERRUPTION)  HOWEVER CAUSED AND ON
   ANY  THEORY OF LIABILITY,  WHETHER  IN CONTRACT,  STRICT LIABILITY,  OR TORT
   (INCLUDING  NEGLIGENCE OR  OTHERWISE) ARISING IN  ANY WAY OUT OF THE  USE OF
   THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
   This software  consists of voluntary contributions made  by many individuals
   on  behalf of the Apache Software  Foundation and was  originally created by
   Stefano Mazzocchi  <stefano@apache.org>. For more  information on the Apache
   Software Foundation, please see <http://www.apache.org/>.
  
  */
  package org.apache.cocoon.portal.event.aspect.impl;
  
  import java.util.StringTokenizer;
  
  import org.apache.avalon.framework.component.ComponentException;
  import org.apache.avalon.framework.component.ComponentManager;
  import org.apache.avalon.framework.component.Composable;
  import org.apache.avalon.framework.logger.AbstractLogEnabled;
  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;
  import org.apache.cocoon.portal.event.Event;
  import org.apache.cocoon.portal.event.Publisher;
  import org.apache.cocoon.portal.event.aspect.EventAspect;
  import org.apache.cocoon.portal.event.aspect.EventAspectContext;
  import org.apache.cocoon.portal.layout.Layout;
  import org.apache.cocoon.portal.profile.ProfileManager;
  
  /**
   *
   * @author <a href="mailto:juergen.seitz@basf-it-services.com">J&uuml;rgen Seitz</a>
   * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
   * 
   * @version CVS $Id: AbstractContentEventAspect.java,v 1.1 2003/07/14 10:12:14 cziegeler
Exp $
   */
  public abstract class AbstractContentEventAspect
      extends AbstractLogEnabled
      implements EventAspect, ThreadSafe, Composable {
  
      protected ComponentManager manager;
  
      protected abstract String getRequestParameterName();
      
      protected abstract int getRequiredValueCount();
      
      /**
       * Custom publishing of an event.
       * The real values for the event are contained in the array
       * starting with index 2!
       * @param layout  The corresponding layout
       * @param values  The values contained in the request
       */
      protected abstract void publish(Publisher publisher, Layout layout, String[] values);
      
      /**
       * Publish the event.
       * This method gets the layout object from the first two
       * values and invokes {@link #publish(Publisher, Layout, String[])}.
       * @param values The values contained in the request
       */
      protected void publish(Publisher publisher, String[] values) {
          ProfileManager profileManager = null;
          try {
              profileManager = (ProfileManager)this.manager.lookup(ProfileManager.ROLE);
              Layout layout = profileManager.getPortalLayout(values[0], values[1] );
              if ( layout != null ) {
                  this.publish( publisher, layout, values);
              }
          } catch (ComponentException ignore) {
          } finally {
              this.manager.release( profileManager );
          }
      }
      
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext,
org.apache.cocoon.portal.PortalService)
       */
      public void process(EventAspectContext context, PortalService service) {
          final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
          String[] values = request.getParameterValues(this.getRequestParameterName());
          if (values != null) {
              final Publisher publisher = context.getEventPublisher();
              for (int i = 0; i < values.length; i++) {
                  // first try to make an event out of the value of the parameter
                  final String value = values[i];
                  Event e = null;
                  try {
                      e = context.getEventConverter().decode(value);
                      if (null != e) {
                          publisher.publish(e);
                      }
                  } catch (Exception ignore) {
                  }
                  // the event could not be generated, so try different approach
                  if (e == null) {
                      // Use '|' character as delimiter between Group, ID and URI
  					StringTokenizer tokenizer = new StringTokenizer(value, "|");
  					int tokenNumber = 0;
  					int tokenCount = tokenizer.countTokens();
  					// if only 2 params are in the String
                      // the groupKey is missing and defaults to null
  					if (tokenCount == this.getRequiredValueCount()-1) {
                          tokenNumber = tokenNumber + 1;
                          tokenCount++;
  					}
                      
                      if ( tokenCount == this.getRequiredValueCount() ) {
                          String [] eventValues = new String[tokenCount];
                                          
                          while (tokenizer.hasMoreTokens()) {
                              eventValues[tokenNumber] = tokenizer.nextToken();
                          
                              tokenNumber = tokenNumber + 1;
                          } 
                      
                          this.publish( publisher, eventValues );
  
                      } else {
                          this.getLogger().warn("Data for Event is not set correctly");
                      }
                  }
              }
          }
          // and invoke next one
          context.invokeNext(service);
      }
  
      /* (non-Javadoc)
       * @see org.apache.avalon.framework.component.Composable#compose(org.apache.avalon.framework.component.ComponentManager)
       */
      public void compose(ComponentManager manager) throws ComponentException {
          this.manager = manager;
      }
  
  }
  
  
  

Mime
View raw message