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/impl DefaultEventManager.java
Date Mon, 26 May 2003 09:53:00 GMT
cziegeler    2003/05/26 02:53:00

  Modified:    src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl
                        FrameEventAspect.java
               src/java/org/apache/cocoon/components/sax
                        XMLDeserializer.java XMLByteStreamInterpreter.java
               src/blocks/portal/java/org/apache/cocoon/portal/layout
                        CompositeLayout.java
               src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl
                        URICopletAdapter.java AbstractCopletAdapter.java
               src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter
                        CopletAdapter.java
               src/blocks/portal/java/org/apache/cocoon/portal/coplet
                        CopletBaseData.java
               src/blocks/portal/samples/profiles/mapping
                        copletbasedata.xml
               src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl
                        SessionAspectDataStore.java
               src/blocks/portal/conf portal.xconf
               src/blocks/portal/samples/profiles/copletbasedata portal.xml
               src/blocks/portal/java/org/apache/cocoon/portal/layout/impl
                        CopletLayout.java
               src/blocks/portal/java/org/apache/cocoon/portal/event/impl
                        DefaultEventManager.java
  Added:       src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl
                        SizingEventSubscriber.java
  Removed:     src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl
                        SizingEventSubscriber.java
  Log:
  Implementing fail-save coplet displaying and minor refactoring
  
  Revision  Changes    Path
  1.5       +2 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- FrameEventAspect.java	23 May 2003 14:20:09 -0000	1.4
  +++ FrameEventAspect.java	26 May 2003 09:52:58 -0000	1.5
  @@ -123,6 +123,7 @@
                               this.manager.release( profileManager );
                           }
                           
  +                        // TODO - move this into aspect data store
                           if (uri != null) {
                               service.getLinkService().addEventToLink(e);
                           }
  
  
  
  1.2       +2 -1      cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLDeserializer.java
  
  Index: XMLDeserializer.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLDeserializer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLDeserializer.java	9 Mar 2003 00:09:11 -0000	1.1
  +++ XMLDeserializer.java	26 May 2003 09:52:58 -0000	1.2
  @@ -79,4 +79,5 @@
       */
       void deserialize(Object saxFragment)
       throws SAXException;
  +    
   }
  
  
  
  1.2       +3 -3      cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
  
  Index: XMLByteStreamInterpreter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLByteStreamInterpreter.java	9 Mar 2003 00:09:11 -0000	1.1
  +++ XMLByteStreamInterpreter.java	26 May 2003 09:52:58 -0000	1.2
  @@ -50,12 +50,12 @@
   */
   package org.apache.cocoon.components.sax;
   
  +import java.util.ArrayList;
  +
   import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.cocoon.xml.AbstractXMLProducer;
   import org.xml.sax.SAXException;
   import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.util.ArrayList;
   
   /**
    * This a simple xml compiler which takes a byte array as input.
  
  
  
  1.4       +3 -1      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/CompositeLayout.java
  
  Index: CompositeLayout.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/CompositeLayout.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompositeLayout.java	22 May 2003 15:19:43 -0000	1.3
  +++ CompositeLayout.java	26 May 2003 09:52:58 -0000	1.4
  @@ -60,6 +60,8 @@
    * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
    * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
    * 
  + * TODO Make an interface out of this
  + * 
    * @version CVS $Id$
    */
   public class CompositeLayout extends AbstractLayout {
  
  
  
  1.6       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
  
  Index: URICopletAdapter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- URICopletAdapter.java	23 May 2003 15:04:04 -0000	1.5
  +++ URICopletAdapter.java	26 May 2003 09:52:59 -0000	1.6
  @@ -93,7 +93,7 @@
       
       public void streamContent(CopletInstanceData coplet, ContentHandler contentHandler)
       throws SAXException {
  -		String uri = (String)coplet.getCopletData().getAttribute("uri");
  +		final String uri = (String)coplet.getCopletData().getAttribute("uri");
   		Source copletSource = null;
   		PortalService portalService = null;
   		try {
  
  
  
  1.2       +69 -3     cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java
  
  Index: AbstractCopletAdapter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/AbstractCopletAdapter.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractCopletAdapter.java	23 May 2003 15:04:04 -0000	1.1
  +++ AbstractCopletAdapter.java	26 May 2003 09:52:59 -0000	1.2
  @@ -55,10 +55,16 @@
   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.components.sax.XMLDeserializer;
  +import org.apache.cocoon.components.sax.XMLSerializer;
   import org.apache.cocoon.portal.coplet.CopletInstanceData;
   import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
  +import org.apache.cocoon.xml.ContentHandlerWrapper;
  +import org.apache.cocoon.xml.XMLConsumer;
  +import org.apache.cocoon.xml.XMLUtils;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.SAXException;
  +import org.xml.sax.ext.LexicalHandler;
   
   /**
    * This is the adapter to use pipelines as coplets
  @@ -84,20 +90,80 @@
       }
   
       
  +    /**
  +     * Implement this and not toSAX()
  +     */
       public abstract void streamContent(CopletInstanceData coplet, 
                                            ContentHandler contentHandler)
       throws SAXException; 
       
  -    
       public void toSAX(CopletInstanceData coplet, ContentHandler contentHandler)
       throws SAXException {
  -        this.streamContent( coplet, contentHandler );
  +        Boolean bool = (Boolean)coplet.getCopletData().getAttribute("buffer");
  +        if ( bool == null) {
  +            bool = (Boolean)coplet.getCopletData().getCopletBaseData().getCopletConfig().get("buffer");
  +        }
  +        // FIXME - remove this
  +        bool = new Boolean(true);
  +        
  +        if ( bool != null && bool.booleanValue() ) {
  +            boolean read = false;
  +            XMLSerializer serializer = null;
  +            Object data = null;
  +            try {
  +                serializer = (XMLSerializer)this.manager.lookup(XMLSerializer.ROLE);
  +                
  +                this.streamContent( coplet, serializer );
  +                data = serializer.getSAXFragment();
  +                read = true;
  +            } catch (ComponentException ce) {
  +                throw new SAXException("Unable to lookup xml serializer.", ce);
  +            } catch (Exception exception ) {
  +                this.getLogger().warn("Unable to get content of coplet: " + coplet.getId(),
exception);
  +            } finally {
  +                this.manager.release( serializer );
  +            }
  +            
  +            if ( read ) {
  +                XMLDeserializer deserializer = null;
  +                try {
  +                    deserializer = (XMLDeserializer)this.manager.lookup(XMLDeserializer.ROLE);
  +                    if ( contentHandler instanceof XMLConsumer ) {
  +                        deserializer.setConsumer( (XMLConsumer)contentHandler );
  +                    } else {
  +                        LexicalHandler lh = (contentHandler instanceof LexicalHandler ?
(LexicalHandler)contentHandler : null);
  +                        deserializer.setConsumer(  new ContentHandlerWrapper(contentHandler,
lh));
  +                    }
  +                    deserializer.deserialize( data );
  +                } catch (ComponentException ce) {
  +                    throw new SAXException("Unable to lookup xml deserializer.", ce);
  +                } finally {
  +                    this.manager.release( deserializer );
  +                }
  +            } else {
  +                // FIXME - get correct error message
  +                contentHandler.startDocument();
  +                XMLUtils.startElement( contentHandler, "p");
  +                XMLUtils.data( contentHandler, "The coplet " + coplet.getId() + " is currently
not available.");
  +                XMLUtils.endElement(contentHandler, "p");
  +                contentHandler.endDocument();                
  +            }
  +        } else {
  +            this.streamContent( coplet, contentHandler );
  +        }
  +        
       }
       
       public void init(CopletInstanceData coplet) {
       }
       
       public void destroy(CopletInstanceData coplet) {
  +    }
  +
  +    public void login(CopletInstanceData coplet) {
  +    }
  +        
  +    public void logout(CopletInstanceData coplet) {
       }
       
   }
  
  
  
  1.3       +31 -3     cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java
  
  Index: CopletAdapter.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/CopletAdapter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CopletAdapter.java	22 May 2003 15:19:43 -0000	1.2
  +++ CopletAdapter.java	26 May 2003 09:52:59 -0000	1.3
  @@ -73,11 +73,39 @@
   
       String ROLE = CopletAdapter.class.getName();
       
  +    /**
  +     * Initialize the coplet
  +     * This method is called immediately after a new instance is created.
  +     * For each coplet, this method is only invoked once.
  +     * @param coplet The coplet
  +     */
       void init(CopletInstanceData coplet);
       
  +    /**
  +     * Destroy the coplet
  +     * This method is invoked when a coplet instance will be destroyed
  +     * For each coplet, this method is only invoked once.
  +     * @param coplet
  +     */
  +    void destroy(CopletInstanceData coplet);
  +
  +    /**
  +     * Stream the content of the coplet
  +     */
       void toSAX(CopletInstanceData coplet, ContentHandler contentHandler)
       throws SAXException;
       
  -    void destroy(CopletInstanceData coplet);
  -    
  +    /**
  +     * User logs in to a coplet
  +     * This method is invoked when a user logs in for each coplet instance
  +     * of the user
  +     */
  +    void login(CopletInstanceData coplet);
  +        
  +    /**
  +     * User logs out from a coplet
  +     * This method is invoked when a user logs out for each coplet instance
  +     * of this user.
  +     */
  +    void logout(CopletInstanceData coplet);
   }
  
  
  
  1.5       +1 -11     cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
  
  Index: CopletBaseData.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CopletBaseData.java	21 May 2003 13:06:01 -0000	1.4
  +++ CopletBaseData.java	26 May 2003 09:52:59 -0000	1.5
  @@ -69,8 +69,6 @@
   
   	private String copletAdapterName = null;
   
  -	private String defaultRendererName = null;
  -
   	public CopletBaseData() {
   	}
   
  @@ -84,14 +82,6 @@
   
   	public String getCopletAdapterName() {
   		return this.copletAdapterName;
  -	}
  -
  -	public String getDefaultRendererName() {
  -		return this.defaultRendererName;
  -	}
  -
  -	public void setDefaultRendererName(String defaultName) {
  -		this.defaultRendererName = defaultName;
   	}
   
   	public Object getCopletConfig(String key) {
  
  
  
  1.4       +0 -4      cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletbasedata.xml
  
  Index: copletbasedata.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletbasedata.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- copletbasedata.xml	21 May 2003 13:06:00 -0000	1.3
  +++ copletbasedata.xml	26 May 2003 09:52:59 -0000	1.4
  @@ -21,10 +21,6 @@
   			<bind-xml name="coplet-adapter" />
   		</field>
   
  -		<field name="defaultRendererName" type="java.lang.String">
  -			<bind-xml name="default-renderer" />
  -		</field>
  -
   		<field name="copletConfig" type="org.exolab.castor.mapping.MapItem" collection="map"
handler="org.apache.cocoon.portal.profile.impl.ConfigurationFieldHandler">
   			<bind-xml name="configuration"/>
   		</field>
  
  
  
  1.4       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/SessionAspectDataStore.java
  
  Index: SessionAspectDataStore.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/aspect/impl/SessionAspectDataStore.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SessionAspectDataStore.java	23 May 2003 12:13:14 -0000	1.3
  +++ SessionAspectDataStore.java	26 May 2003 09:52:59 -0000	1.4
  @@ -75,7 +75,7 @@
       extends AbstractLogEnabled
       implements Component, ThreadSafe, AspectDataStore, Contextualizable {
       
  -     protected Context context;
  +    protected Context context;
       
       protected Map getMap(Aspectalizable owner) {
           final Request request = ContextHelper.getRequest(this.context);
  
  
  
  1.9       +1 -1      cocoon-2.1/src/blocks/portal/conf/portal.xconf
  
  Index: portal.xconf
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/conf/portal.xconf,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- portal.xconf	22 May 2003 12:32:47 -0000	1.8
  +++ portal.xconf	26 May 2003 09:52:59 -0000	1.9
  @@ -144,7 +144,7 @@
                   renderer="row">
           </layout>
           <layout name="tab" 
  -                class="org.apache.cocoon.portal.layout.impl.TabLayout" 
  +                class="org.apache.cocoon.portal.layout.impl.CompositeLayout" 
                   renderer="tab">
               <aspects>
                   <aspect name="tab" class="java.lang.Integer" store="session" auto-create="true"/>
  
  
  
  1.3       +0 -1      cocoon-2.1/src/blocks/portal/samples/profiles/copletbasedata/portal.xml
  
  Index: portal.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/copletbasedata/portal.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- portal.xml	20 May 2003 14:32:37 -0000	1.2
  +++ portal.xml	26 May 2003 09:52:59 -0000	1.3
  @@ -2,7 +2,6 @@
   <coplets>
      <coplet-base-data id="URICoplet">
         <coplet-adapter>uri</coplet-adapter>
  -      <default-renderer>window</default-renderer>
      </coplet-base-data>
   </coplets>
   
  
  
  
  1.2       +1 -7      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java
  
  Index: CopletLayout.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/impl/CopletLayout.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CopletLayout.java	7 May 2003 06:22:21 -0000	1.1
  +++ CopletLayout.java	26 May 2003 09:52:59 -0000	1.2
  @@ -72,10 +72,4 @@
           return this.copletInstanceData;
       }
   
  -    public String getRendererName() {
  -        if (this.rendererName == null) {
  -            return this.copletInstanceData.getCopletData().getCopletBaseData().getDefaultRendererName();
  -        }
  -        return this.rendererName;
  -    }
   }
  
  
  
  1.1                  cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/SizingEventSubscriber.java
  
  Index: SizingEventSubscriber.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.subscriber.impl;
  
  import org.apache.avalon.framework.component.ComponentException;
  import org.apache.avalon.framework.component.ComponentManager;
  import org.apache.cocoon.portal.coplet.status.SizingStatus;
  import org.apache.cocoon.portal.event.Event;
  import org.apache.cocoon.portal.event.Filter;
  import org.apache.cocoon.portal.event.Subscriber;
  import org.apache.cocoon.portal.event.impl.*;
  import org.apache.cocoon.portal.profile.ProfileManager;
  
  /**
   *
   * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
   * @author <a href="mailto:volker.schmitt@basf-it-services.com">Volker Schmitt</a>
   * 
   * @version CVS $Id: SizingEventSubscriber.java,v 1.1 2003/05/26 09:52:59 cziegeler Exp
$
   */
  public final class SizingEventSubscriber implements Subscriber {
  
      private ComponentManager manager;
  
      public SizingEventSubscriber(ComponentManager manager) {
          this.manager = manager;
      }
  
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.event.Subscriber#getEventType()
       */
      public Class getEventType() {
          return SizingStatusEvent.class;
      }
  
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.event.Subscriber#getFilter()
       */
      public Filter getFilter() {
          return null;
      }
  
      /* (non-Javadoc)
       * @see org.apache.cocoon.portal.event.Subscriber#inform(org.apache.cocoon.portal.event.Event)
       */
      public void inform(Event event) {
          SizingStatusEvent statusEvent = (SizingStatusEvent) event;
          SizingStatus target = statusEvent.getStatus();
          ProfileManager profileManager = null;
          try {
              profileManager = (ProfileManager) this.manager.lookup(ProfileManager.ROLE);
              target = new SizingStatus();
              statusEvent.getCopletInstanceData().setAspectData("size", target);
          } catch (ComponentException ce) {
              // ignore
          } finally {
              this.manager.release(profileManager);
          }
          
          int action = statusEvent.getAction();
  
          target.setStatus(action);
      }
  
  }
  
  
  
  1.7       +2 -2      cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
  
  Index: DefaultEventManager.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- DefaultEventManager.java	23 May 2003 14:20:09 -0000	1.6
  +++ DefaultEventManager.java	26 May 2003 09:53:00 -0000	1.7
  @@ -79,9 +79,9 @@
   import org.apache.cocoon.portal.event.Register;
   import org.apache.cocoon.portal.event.Subscriber;
   import org.apache.cocoon.portal.event.aspect.EventAspect;
  -import org.apache.cocoon.portal.event.aspect.impl.SizingEventSubscriber;
   import org.apache.cocoon.portal.event.subscriber.impl.DefaultChangeAspectDataEventSubscriber;
   import org.apache.cocoon.portal.event.subscriber.impl.DefaultLayoutEventSubscriber;
  +import org.apache.cocoon.portal.event.subscriber.impl.SizingEventSubscriber;
   
   /**
    *
  
  
  

Mime
View raw message