You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by lu...@apache.org on 2005/03/21 19:05:01 UTC

cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/event WebdavAdapter.java WebdavEvent.java WebdavListener.java

luetzkendorf    2005/03/21 10:05:00

  Modified:    src/webdav/server/org/apache/slide/webdav/method
                        MkcolMethod.java PutMethod.java
               src/webdav/server/org/apache/slide/webdav/event
                        WebdavAdapter.java WebdavEvent.java
                        WebdavListener.java
  Log:
  New WebdavEvents mkcolAfter, putAfter.
  
  Revision  Changes    Path
  1.43      +5 -0      jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java
  
  Index: MkcolMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/MkcolMethod.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- MkcolMethod.java	25 Feb 2005 17:03:52 -0000	1.42
  +++ MkcolMethod.java	21 Mar 2005 18:05:00 -0000	1.43
  @@ -207,6 +207,11 @@
               else {
                   content.store(slideToken, colName, revisionDescriptor, null);
               }
  +            
  +            if (WebdavEvent.MKCOL_AFTER.isEnabled()) {
  +                EventDispatcher.getInstance().fireVetoableEvent(WebdavEvent.MKCOL_AFTER,
  +                        new WebdavEvent(this));
  +            }
           } catch (Exception e) {
               int statusCode = getErrorCode( e );
               sendError( statusCode, e );
  
  
  
  1.93      +13 -1     jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java
  
  Index: PutMethod.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/PutMethod.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- PutMethod.java	25 Feb 2005 17:03:52 -0000	1.92
  +++ PutMethod.java	21 Mar 2005 18:05:00 -0000	1.93
  @@ -157,7 +157,10 @@
           
           try {
               // fire put event
  -            if ( WebdavEvent.PUT.isEnabled() ) EventDispatcher.getInstance().fireVetoableEvent(WebdavEvent.PUT, new WebdavEvent(this));
  +            if ( WebdavEvent.PUT.isEnabled() ) {
  +                EventDispatcher.getInstance().fireVetoableEvent(WebdavEvent.PUT,
  +                        new WebdavEvent(this));
  +            }
   
               try {
   
  @@ -305,6 +308,10 @@
                   }
                   // Changed for DeltaV --end--
                   
  +                if (WebdavEvent.PUT_AFTER.isEnabled()) {
  +                    EventDispatcher.getInstance().fireVetoableEvent(WebdavEvent.PUT_AFTER,
  +                            new WebdavEvent(this));
  +                }
                   
                   // ETag header
                   resp.setHeader("ETag", revisionDescriptor.getETag() );
  @@ -405,6 +412,11 @@
                       versioningHelper.versionControl(resourcePath);
                   }
                   
  +                if (WebdavEvent.PUT_AFTER.isEnabled()) {
  +                    EventDispatcher.getInstance().fireVetoableEvent(WebdavEvent.PUT_AFTER,
  +                            new WebdavEvent(this));
  +                }
  +                
                   // ETag header
                   resp.setHeader("ETag", revisionDescriptor.getETag() );
                   
  
  
  
  1.7       +6 -0      jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavAdapter.java
  
  Index: WebdavAdapter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavAdapter.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- WebdavAdapter.java	25 Feb 2005 16:57:28 -0000	1.6
  +++ WebdavAdapter.java	21 Mar 2005 18:05:00 -0000	1.7
  @@ -37,6 +37,9 @@
       public void put(WebdavEvent event) throws VetoException {
       }
   
  +    public void putAfter(WebdavEvent event) throws VetoException {
  +    }
  +
       public void propFind(WebdavEvent event) throws VetoException {
       }
   
  @@ -55,6 +58,9 @@
       public void mkcol(WebdavEvent event) throws VetoException {
       }
   
  +    public void mkcolAfter(WebdavEvent event) throws VetoException {
  +    }
  +    
       public void copy(WebdavEvent event) throws VetoException {
       }
   
  
  
  
  1.8       +22 -0     jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavEvent.java
  
  Index: WebdavEvent.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavEvent.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WebdavEvent.java	25 Feb 2005 16:57:28 -0000	1.7
  +++ WebdavEvent.java	21 Mar 2005 18:05:00 -0000	1.8
  @@ -38,12 +38,14 @@
   public final class WebdavEvent extends EventObject {
       public static Get GET = new Get();
       public static Put PUT = new Put();
  +    public static PutAfter PUT_AFTER = new PutAfter();
       public static PropFind PROPFIND = new PropFind();
       public static PropPatch PROPPATCH = new PropPatch();
       public static Bind BIND = new Bind();
       public static Rebind REBIND = new Rebind();
       public static Unbind UNBIND = new Unbind();
       public static Mkcol MKCOL = new Mkcol();
  +    public static MkcolAfter MKCOL_AFTER = new MkcolAfter();
       public static Copy COPY = new Copy();
       public static Move MOVE = new Move();
       public static Delete DELETE = new Delete();
  @@ -102,6 +104,16 @@
               if ( listener instanceof WebdavListener ) ((WebdavListener)listener).put((WebdavEvent)event);
           }
       }
  +    
  +    public final static class PutAfter extends VetoableEventMethod {
  +        public PutAfter() {
  +            super(GROUP, "put-after");
  +        }
  +
  +        public void fireVetaoableEvent(EventListener listener, EventObject event) throws VetoException  {
  +            if ( listener instanceof WebdavListener ) ((WebdavListener)listener).putAfter((WebdavEvent)event);
  +        }
  +    }
   
       public final static class PropFind extends VetoableEventMethod {
           public PropFind() {
  @@ -163,6 +175,16 @@
           }
       }
   
  +    public final static class MkcolAfter extends VetoableEventMethod {
  +        public MkcolAfter() {
  +            super(GROUP, "mkcol-after");
  +        }
  +
  +        public void fireVetaoableEvent(EventListener listener, EventObject event) throws VetoException  {
  +            if ( listener instanceof WebdavListener ) ((WebdavListener)listener).mkcolAfter((WebdavEvent)event);
  +        }
  +    }
  +    
       public final static class Copy extends VetoableEventMethod {
           public Copy() {
               super(GROUP, "copy");
  
  
  
  1.8       +9 -2      jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavListener.java
  
  Index: WebdavListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/event/WebdavListener.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- WebdavListener.java	25 Feb 2005 16:57:28 -0000	1.7
  +++ WebdavListener.java	21 Mar 2005 18:05:00 -0000	1.8
  @@ -29,8 +29,11 @@
   
   /**
    * Event listener that listens for WebDAV requests. There is an event for each
  - * WebDAV method supported by Slide. The events are called before the actual
  - * work is started. The Event source is the corresponding WebDAV-method object
  + * WebDAV method supported by Slide. 
  + * 
  + * <p>The events are called before the actual work is started. 
  + * 
  + * <p>The Event source is the corresponding WebDAV-method object
    * (e.g. {@link org.apache.slide.webdav.method.CopyMethod}for a COPY request).
    * There you can retrieve more infos about the current request, the
    * NamespaceAccessToken, the SlideToken etc.
  @@ -39,6 +42,8 @@
       void get(WebdavEvent event) throws VetoException;
   
       void put(WebdavEvent event) throws VetoException;
  +    
  +    void putAfter(WebdavEvent event) throws VetoException;
   
       void propFind(WebdavEvent event) throws VetoException;
   
  @@ -51,6 +56,8 @@
       void unbind(WebdavEvent event) throws VetoException;
   
       void mkcol(WebdavEvent event) throws VetoException;
  +    
  +    void mkcolAfter(WebdavEvent event) throws VetoException;
   
       void copy(WebdavEvent event) throws VetoException;
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org