Fixing unlock for Vista too early

Progress Bar(download/upload) for Vista 

git-svn-id: https://www.silverpeas.org/svn/silverpeas/services/office-online/trunk@510 a8e77078-a1c7-4fa5-b8fc-53c5178a176c

Author: Emmanuel Hugonnet

src/main/java/com/silverpeas/openoffice/windows/FileWebDavAccessManager.java

@@ -25,8 +25,10 @@
 
 import com.silverpeas.openoffice.*;
 import com.silverpeas.openoffice.util.MessageUtil;
+import java.io.BufferedInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -41,6 +43,8 @@
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.ProgressMonitor;
+import javax.swing.ProgressMonitorInputStream;
 import org.apache.commons.httpclient.Credentials;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
@@ -117,13 +121,11 @@ public String retrieveFile(String url) throws HttpException, IOException,
     URI uri = getURI(url);
     URL formattedUrl = new URL(uri.getEscapedURI());
     HttpClient client = initConnection(formattedUrl);
-
     logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.locking")
             + ' ' + uri.getEscapedURI());
     //Let's lock the file
     LockMethod lockMethod = new LockMethod(uri.getEscapedURI(),
-            Scope.EXCLUSIVE, Type.WRITE,
-            userName, 600000l, false);
+            Scope.EXCLUSIVE, Type.WRITE, userName, 600000l, false);
     client.executeMethod(lockMethod);
     if (lockMethod.succeeded()) {
       lockToken = lockMethod.getLockToken();
@@ -139,27 +141,30 @@ public String retrieveFile(String url) throws HttpException, IOException,
     client.executeMethod(method);
     if (method.getStatusCode() != 200) {
       throw new IOException(MessageUtil.getMessage("error.get.remote.file")
-              + +' ' + method.getStatusCode() + " - " + method.getStatusText());
+              + ' ' + method.getStatusCode() + " - " + method.getStatusText());
     }
-
     String fileName = formattedUrl.getFile();
     fileName = fileName.substring(fileName.lastIndexOf('/') + 1);
     fileName = URLDecoder.decode(fileName, "UTF-8");
+    ProgressMonitorInputStream is = new ProgressMonitorInputStream(null,
+            MessageUtil.getMessage("downloading.remote.file") + " " + fileName,
+            new BufferedInputStream(method.getResponseBodyAsStream()));
     fileName = fileName.replace(' ', '_');
-    InputStream is = method.getResponseBodyAsStream();
+    ProgressMonitor monitor = is.getProgressMonitor();
+    monitor.setMaximum(new Long(method.getResponseContentLength()).intValue());
     File tempDir = new File(System.getProperty("java.io.tmpdir"), "silver-"
             + System.currentTimeMillis());
     tempDir.mkdirs();
     File tmpFile = new File(tempDir, fileName);
     FileOutputStream fos = new FileOutputStream(tmpFile);
-    int data = is.read();
-    while (data != -1) {
-      fos.write(data);
-      data = is.read();
+    byte[] data = new byte[64];
+    int c = 0;
+    while ((c = is.read(data)) > -1) {
+      fos.write(data, 0, c);
     }
     fos.close();
-    logger.log(Level.INFO, MessageUtil.getMessage(
-            "info.webdav.file.locally.saved") + ' ' + tmpFile.getAbsolutePath());
+    logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.file.locally.saved") + ' '
+            + tmpFile.getAbsolutePath());
     return tmpFile.getAbsolutePath();
   }
 
@@ -183,52 +188,53 @@ public void pushFile(String tmpFilePath, String url) throws HttpException,
      */
     URI uri = getURI(url);
     HttpClient client = initConnection(new URL(uri.getEscapedURI()));
-    
+
     /*
      * Checks if file still exists
      */
     GetMethod method = new GetMethod();
     method.setURI(uri);
     client.executeMethod(method);
-
     if (method.getStatusCode() == 200) {
-      logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.unlocking")
-              + ' ' + uri.getEscapedURI());
-      //Let's lock the file
-      UnLockMethod unlockMethod = new UnLockMethod(uri.getEscapedURI(), lockToken);
-      client.executeMethod(unlockMethod);
-      if (unlockMethod.getStatusCode() != 200 && unlockMethod.getStatusCode()
-              != 204) {
-        logger.log(Level.INFO,
-                MessageUtil.getMessage("error.webdav.unlocking") + ' ' + unlockMethod.getStatusCode());
-      }
-      try {
-        unlockMethod.checkSuccess();
-        logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.unlocked"));
-      } catch (DavException ex) {
-        logger.log(Level.SEVERE,
-                MessageUtil.getMessage("error.webdav.unlocking"), ex);
-        throw new IOException(MessageUtil.getMessage("error.webdav.unlocking"),
-                ex);
-      }
-
       PutMethod putMethod = new PutMethod(uri.getEscapedURI());
       logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.put")
               + ' ' + tmpFilePath);
       File file = new File(tmpFilePath);
-      InputStream is = new FileInputStream(file);
+      ProgressMonitorInputStream is = new ProgressMonitorInputStream(null,
+              MessageUtil.getMessage("uploading.remote.file") + " " + file.getName(),
+              new BufferedInputStream(new FileInputStream(file)));
+      ProgressMonitor monitor = is.getProgressMonitor();
+      monitor.setMaximum(new Long(file.length()).intValue());
       ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      int data = is.read();
-      while (data != -1) {
-        baos.write(data);
-        data = is.read();
+      byte[] data = new byte[64];
+      int c = 0;
+      while ((c = is.read(data)) > -1) {
+        baos.write(data, 0, c);
       }
-      byte[] bytes = baos.toByteArray();
-      RequestEntity requestEntity = new ByteArrayRequestEntity(bytes);
+      RequestEntity requestEntity = new ByteArrayRequestEntity(baos.toByteArray());
       putMethod.setRequestEntity(requestEntity);
+      putMethod.setRequestHeader(PutMethod.HEADER_LOCK_TOKEN, lockToken);
       client.executeMethod(putMethod);
       if (putMethod.succeeded()) {
         logger.log(Level.INFO, MessageUtil.getMessage("info.file.updated"));
+        logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.unlocking")
+                + ' ' + uri.getEscapedURI());
+        //Let's unlock the file
+        UnLockMethod unlockMethod = new UnLockMethod(uri.getEscapedURI(), lockToken);
+        client.executeMethod(unlockMethod);
+        if (unlockMethod.getStatusCode() != 200 && unlockMethod.getStatusCode() != 204) {
+          logger.log(Level.INFO, MessageUtil.getMessage("error.webdav.unlocking") + ' '
+                  + unlockMethod.getStatusCode());
+        }
+        try {
+          unlockMethod.checkSuccess();
+          logger.log(Level.INFO, MessageUtil.getMessage("info.webdav.unlocked"));
+        } catch (DavException ex) {
+          logger.log(Level.SEVERE,
+                  MessageUtil.getMessage("error.webdav.unlocking"), ex);
+          throw new IOException(MessageUtil.getMessage("error.webdav.unlocking"),
+                  ex);
+        }
         // delete temp file
         file.delete();
         file.getParentFile().delete();

src/main/resources/com/silverpeas/openoffice/messages.properties

@@ -52,4 +52,7 @@ error.webdav.locking=Couldn't lock the remote file:
 error.get.remote.file=Couldn't get the remote file:
 error.put.remote.file=Couldn't upload the file on the server
 error.remote.file=Remote file doesn't exist anymore 
-error.webdav.unlocking=Couldn't unlock the remote file:
+error.webdav.unlocking=Couldn't unlock the remote file:
+
+downloading.remote.file=Downloading file:
+uploading.remote.file=Uploading file:

src/main/resources/com/silverpeas/openoffice/messages_fr.properties

@@ -53,3 +53,6 @@ error.get.remote.file=Impossible de r\u00E9cup\u00E9rer le fichier distant:
 error.put.remote.file=Impossible de poser le fichier sur le serveur
 error.remote.file=Le fichier distant n'existe plus
 error.webdav.unlocking=Impossible de deverrouiller le fichier distant:
+
+downloading.remote.file=T\u00E9l\u00E9chargement du fichier:
+uploading.remote.file=Envoi sur le serveur du fichier: