Adding support for LibreOffice 3.6

Author: Emmanuel Hugonnet

pom.xml

@@ -17,7 +17,7 @@
   <artifactId>office-online</artifactId>
   <packaging>jar</packaging>
   <version>5.11.1-SNAPSHOT</version>
-  <name>Online Office Editor</name>
+  <name>Online Office Editor - ${project.version}</name>
   <build>
     <finalName>OpenOfficeLauncher</finalName>
   </build>

src/main/java/org/silverpeas/openoffice/Launcher.java

@@ -72,6 +72,8 @@ public static void main(final String[] args) throws OfficeNotFoundException {
       AuthenticationInfo authInfo = null;
       if (args.length >= 5) {
         authInfo = PasswordManager.extractAuthenticationInfo(args[3], args[4]);
+      } else  if (args.length >= 4 ) {
+        authInfo = PasswordManager.extractAuthenticationInfo(args[3], null);
       }
       MsOfficeType contentType = getContentType(UrlExtractor.decodeUrl(args[0]));
       logger.log(Level.FINE, "{0}{1}", new Object[]{MessageUtil.getMessage("info.document.type"),

src/main/java/org/silverpeas/openoffice/util/PasswordManager.java

@@ -100,9 +100,9 @@ public static AuthenticationInfo extractAuthenticationInfo(String login, String
       if (encodedPassword != null && !encodedPassword.isEmpty()) {
         clearPwd = decodePassword(encodedPassword);
       } else {
-        clearPwd = new char[0];
+        clearPwd = null;
       }
-      if (clearPwd.length <= 0) {
+      if (clearPwd == null || clearPwd.length <= 0) {
         clearPwd = promptForpassword();
       }
       String decodedLogin = URLDecoder.decode(login, "UTF-8");
@@ -118,6 +118,8 @@ public static AuthenticationInfo extractAuthenticationInfo(String login, String
   }
 
   private static char[] promptForpassword() {
+    Logger.getLogger(Launcher.class.getName()).log(Level.INFO,
+        "No password provided, need to ask for one");
     return MessageDisplayer.displayPromptPassword();
   }
 }

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

@@ -51,8 +51,13 @@ public class FileWebDavAccessManager {
    * @param auth authentication info
    */
   public FileWebDavAccessManager(AuthenticationInfo auth) {
-    this.userName = auth.getLogin();
-    this.password = auth.getPassword();
+    if (auth != null) {
+      this.userName = auth.getLogin();
+      this.password = auth.getPassword();
+    } else {
+      this.userName = "";
+      this.password = new char[0];
+    }
   }
 
   /**
@@ -69,10 +74,10 @@ public String retrieveFile(String url) throws HttpException, IOException {
     // Let's lock the file
     lockToken = webdav.lockFile(uri, userName);
     logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage("info.webdav.locked"),
-          ' ', lockToken});
+      ' ', lockToken});
     String tmpFile = webdav.getFile(uri, lockToken);
     logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage(
-          "info.webdav.file.locally.saved"), ' ', tmpFile});
+      "info.webdav.file.locally.saved"), ' ', tmpFile});
     return tmpFile;
   }
 
@@ -88,7 +93,7 @@ public void pushFile(String tmpFilePath, String url) throws HttpException, IOExc
     URI uri = getURI(url);
     WebdavManager webdav = new WebdavManager(uri.getHost(), userName, new String(password));
     logger.log(Level.INFO, "{0}{1}{2}", new Object[]{MessageUtil.getMessage("info.webdav.put"), ' ',
-          tmpFilePath});
+      tmpFilePath});
     webdav.putFile(uri, tmpFilePath, lockToken);
     logger.log(Level.INFO, "{0}{1}{2}",
         new Object[]{MessageUtil.getMessage("info.webdav.unlocking"), ' ', uri.getEscapedURI()});

src/main/java/org/silverpeas/openoffice/windows/WindowsLibreOfficeFinder.java

@@ -32,7 +32,7 @@
 public class WindowsLibreOfficeFinder extends OpenOfficeFinder {
 
   static final Logger logger = Logger.getLogger(WindowsLibreOfficeFinder.class.getName());
-  private static final String[] VERSIONS = new String[]{"3.5"};
+  private static final String[] VERSIONS = new String[]{"3.5", "3.6"};
   private static final String GLOBAL_LIBRE_OFFICE_FOLDER =
       "\"HKEY_LOCAL_MACHINE\\SOFTWARE\\LibreOffice\\LibreOffice\\";
   private static final String GLOBAL_LIBRE_OFFICE_FOLDER_64 =