The BASIC AUTH Header is now using ISO-8859-1 like Jackrabbit

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

Author: Emmanuel Hugonnet

src/main/java/com/silverpeas/openoffice/windows/webdav/UploadProgressBar.java

@@ -48,6 +48,8 @@ public class UploadProgressBar extends JPanel implements PropertyChangeListener
   private JLabel messageLabel;
   private boolean display = false;
   private JFrame frame = null;
+  private String title = MessageUtil.getMessage("upload.file.title");
+  private String outputFormat = MessageUtil.getMessage("upload.file.task");
 
   public UploadProgressBar() {
     super(new BorderLayout());
@@ -86,6 +88,14 @@ public void setMinimum(int min) {
     progressBar.setMinimum(min);
   }
 
+  /**
+   * Defines the minimum value for the progress bar.
+   * @param min the minimum value for the progress bar.
+   */
+  public void setOutputFormat(String outputFormat) {
+    this.outputFormat = outputFormat;
+  }
+
   /**
    * Defines the message to be displayed before the progress bar.
    * @param message the message to be displayed before the progress bar.
@@ -94,6 +104,25 @@ public void setMessage(String message) {
     messageLabel.setText(message);
   }
 
+  /**
+   * Defines the title of the progress bar dialog.
+   * @param title the title of the progress bar dialog.
+   */
+  public void setTitle(String title) {
+    this.title = title;
+    if (this.frame != null) {
+      this.frame.setTitle(title);
+    }
+  }
+
+  /**
+   * Defines the title of the progress bar dialog.
+   * @param title the title of the progress bar dialog.
+   */
+  public void setProgress(int progress) {
+    propertyChange(new PropertyChangeEvent(this, "progress", 0, progress));
+  }
+
   /**
    * Invoked when task's progress property changes.
    */
@@ -106,7 +135,7 @@ public void propertyChange(PropertyChangeEvent evt) {
       }
       int progress = (Integer) evt.getNewValue();
       progressBar.setValue(progress);
-      taskOutput.setText(String.format(MessageUtil.getMessage("upload.file.task"),
+      taskOutput.setText(String.format(outputFormat,
               100 * progressBar.getPercentComplete()));
     }
   }
@@ -116,6 +145,7 @@ public void propertyChange(PropertyChangeEvent evt) {
    */
   private void start() {
     javax.swing.SwingUtilities.invokeLater(new Runnable() {
+
       @Override
       public void run() {
         createAndShowGUI();
@@ -137,7 +167,7 @@ public void close() {
    */
   private void createAndShowGUI() {
     // Create and set up the window.
-    frame = new JFrame(MessageUtil.getMessage("upload.file.title"));
+    frame = new JFrame(title);
     frame.setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
     frame.setSize(FRAME_WIDTH, FRAME_HEIGHT);
     this.setOpaque(true); // content panes must be opaque

src/main/java/com/silverpeas/openoffice/windows/webdav/WebdavManager.java

@@ -49,9 +49,11 @@
 import javax.swing.ProgressMonitor;
 import javax.swing.ProgressMonitorInputStream;
 import javax.swing.UIManager;
+import org.apache.commons.httpclient.HttpVersion;
 import org.apache.commons.httpclient.methods.ByteArrayRequestEntity;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.commons.httpclient.params.HttpClientParams;
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.client.methods.PutMethod;
 import org.apache.jackrabbit.webdav.client.methods.UnLockMethod;
@@ -77,11 +79,14 @@ public WebdavManager(String host, String login, String password) {
     hostConfig.setHost(host);
     HttpConnectionManager connectionManager =
         new MultiThreadedHttpConnectionManager();
-    HttpConnectionManagerParams params = new HttpConnectionManagerParams();
+    HttpConnectionManagerParams connectionParams = new HttpConnectionManagerParams();
     int maxHostConnections = 20;
-    params.setMaxConnectionsPerHost(hostConfig, maxHostConnections);
-    connectionManager.setParams(params);
-    client = new HttpClient(connectionManager);
+    connectionParams.setMaxConnectionsPerHost(hostConfig, maxHostConnections);
+    connectionManager.setParams(connectionParams);
+    HttpClientParams clientParams = new HttpClientParams();
+    clientParams.setParameter(HttpClientParams.CREDENTIAL_CHARSET, "ISO-8859-1");
+    clientParams.setParameter(HttpClientParams.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
+    client = new HttpClient(clientParams, connectionManager);
     Credentials creds = new UsernamePasswordCredentials(login, password);
     client.getState().setCredentials(AuthScope.ANY, creds);
     client.setHostConfiguration(hostConfig);

src/test/java/com/silverpeas/openoffice/util/PasswordManagerTest.java

@@ -59,6 +59,10 @@ public void testDecodePassword() throws Exception {
     String expResult = "helloworld";
     String result = PasswordManager.decodePassword(encodedPassword);
     assertEquals(expResult, result);
+    encodedPassword = "4e2bb11fc119471ff3c0ba210d9843d1";
+    expResult = "héhèhàhh";
+    result = PasswordManager.decodePassword(encodedPassword);
+    assertEquals(expResult, result);
   }
 
   /**
@@ -69,6 +73,10 @@ public void testEncodePassword() throws Exception {
     String expResult = "5f6b7130460e9b316ca968ec952d3fa3";
     String result = PasswordManager.encodePassword(password);
     assertEquals(expResult, result);
+    password = "héhèhàhh";
+    expResult = "4e2bb11fc119471ff3c0ba210d9843d1";
+    result = PasswordManager.encodePassword(password);
+    assertEquals(expResult, result);
   }
 
   /**