cvs commit: cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/webdav WebDAVUtil.java

[gcasper]

gcasper     2004/04/05 04:27:38

  Modified:    
src/blocks/webdav/java/org/apache/cocoon/components/repository/impl
                        WebDAVRepositoryVersioningHelper.java
               src/blocks/webdav/java/org/apache/cocoon/components/webdav
                        WebDAVUtil.java
  Log:
  Formatting
  
  Revision  Changes    Path
  1.4       +18 -16    
cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java
  
  Index: WebDAVRepositoryVersioningHelper.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/repository/impl/WebDAVRepositoryVersioningHelper.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WebDAVRepositoryVersioningHelper.java     5 Apr 2004 10:49:41 -0000       
1.3
  +++ WebDAVRepositoryVersioningHelper.java     5 Apr 2004 11:27:38 -0000       
1.4
  @@ -26,7 +26,6 @@
   import org.apache.avalon.framework.service.Serviceable;
   import org.apache.cocoon.components.repository.helpers.CredentialsToken;
   import 
org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper;
  -import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.components.webdav.WebDAVUtil;
   import org.apache.commons.httpclient.HttpException;
   
  @@ -137,31 +136,34 @@
        * @see 
org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper#setVersioned(java.lang.String,
 boolean)
        */
       public boolean setVersioned(final String uri, final boolean versioned) { 
           
  +
           try {
  -            if(!versioned)
  -                return unsetVersioned(uri);                                  
                                                 
  -            else      
  -                return 
WebDAVUtil.getWebdavResource(this.repo.getAbsoluteURI(uri)).versionControlMethod(this.repo.getAbsoluteURI(uri));
                           
  +            if(!versioned) {
  +                WebDAVUtil.moveResource(this.repo.getAbsoluteURI(uri),
  +                                        this.repo.getAbsoluteURI(uri + 
".temp"),
  +                                        false,
  +                                        false);
  +                WebDAVUtil.copyResource(this.repo.getAbsoluteURI(uri + 
".temp"),
  +                                        this.repo.getAbsoluteURI(uri),
  +                                        false,
  +                                        false);
  +                WebDAVUtil.getWebdavResource(this.repo.getAbsoluteURI(uri + 
".temp")).deleteMethod();
  +                return true;
  +
  +            } else {      
  +                return 
WebDAVUtil.getWebdavResource(this.repo.getAbsoluteURI(uri))
  +                                                    
.versionControlMethod(this.repo.getAbsoluteURI(uri));
  +            }
  +
           } catch (HttpException he) {
               this.getLogger().error("HTTP Error while versioncontrol " + uri, 
he);
           } catch (IOException ioe) {
               this.getLogger().error("IO Error while versioncontrol " + uri, 
ioe);
  -        } catch (ProcessingException pe) {
  -            this.getLogger().error("Processing Error while versioncontrol " 
+ uri, pe);
           }
           
           return false;
       }
   
  -    private boolean unsetVersioned(final String uri)
  -         throws ProcessingException 
  -     {
  -         //TODO: Also copy props
  -         final String content = this.repo.getContentString(uri);
  -         final List props = 
this.repo.getPropertyHelper().getAllProperties(uri);
  -         return this.repo.remove(uri) && this.repo.createResource(uri, 
content);    
  -     }
  -    
       /* (non-Javadoc)
        * @see 
org.apache.cocoon.components.repository.helpers.RepositoryVersioningHelper#getVersions(java.lang.String)
        */
  
  
  
  1.4       +7 -7      
cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/webdav/WebDAVUtil.java
  
  Index: WebDAVUtil.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/blocks/webdav/java/org/apache/cocoon/components/webdav/WebDAVUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WebDAVUtil.java   5 Apr 2004 10:14:48 -0000       1.3
  +++ WebDAVUtil.java   5 Apr 2004 11:27:38 -0000       1.4
  @@ -72,15 +72,15 @@
       throws HttpException, IOException {
   
           HttpURL sourceURL = new HttpURL(uri);
  -        System.out.println("WebDAVUtil ####### url="+uri + " content=" + 
content);
           final WebdavResource resource = new WebdavResource(sourceURL, 
  -                                                                             
                   WebdavResource.NOACTION, 
  -                                                                             
                   WebdavResource.getDefaultDepth());
  +                                                           
WebdavResource.NOACTION, 
  +                                                           
WebdavResource.getDefaultDepth());
                   
  -        if(!resource.putMethod(content))
  -                    throw new HttpException("Error creating resource: " + uri
  -                    + " Status: " + resource.getStatusCode()
  -                    + " Message: " + resource.getStatusMessage());
  +        if(!resource.putMethod(content)) {
  +            throw new HttpException("Error creating resource: " + uri
  +                                    + " Status: " + resource.getStatusCode()
  +                                    + " Message: " + 
resource.getStatusMessage());
  +        }
       }
   
       /**