Bug #4346 : Updating code to detect Old office versions thus using a basic auth url instead of the digest.

Author: Emmanuel Hugonnet

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

@@ -32,6 +32,7 @@
 import org.silverpeas.openoffice.util.MsOfficeType;
 import org.silverpeas.openoffice.util.OsEnum;
 import org.silverpeas.openoffice.windows.FileWebDavAccessManager;
+import org.silverpeas.openoffice.windows.MsOfficeVersion;
 
 /**
  * @author Emmanuel Hugonnet
@@ -61,7 +62,7 @@ public static int launch(MsOfficeType type, String url, AuthenticationInfo authI
     logger.log(Level.INFO, "Are we using Office 2007 : {0}", finder.isMicrosoftOffice());
     logger.log(Level.INFO, "We are on {0} OS", OsEnum.getOS());
     boolean modeDisconnected = ((OsEnum.isWindows() && useDeconnectedMode) || OsEnum.getOS()
-        == OsEnum.MAC_OSX) && finder.isMicrosoftOffice();
+        == OsEnum.MAC_OSX) && finder.isMicrosoftOffice();    
     switch (type) {
       case EXCEL:
         return launch(finder.findSpreadsheet(), url, modeDisconnected, authInfo);
@@ -114,8 +115,12 @@ public static int launch(String path, String url, boolean modeDisconnected,
       }
     } else {
       // Standard mode : just open it
-      logger.log(Level.INFO, "The exact exec line: {0} {2}", new Object[]{path, url});
-      Process process = Runtime.getRuntime().exec(path + ' ' + url);
+      String webdavUrl = url;
+      if(OsEnum.isWindows() && MsOfficeVersion.isOldOffice()) {
+        webdavUrl = webdavUrl.replace("/repository/", "/repository2000/");
+      }
+      logger.log(Level.INFO, "The exact exec line: {0} {2}", new Object[]{path, webdavUrl});
+      Process process = Runtime.getRuntime().exec(path + ' ' + webdavUrl);
       return process.waitFor();
     }
   }

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

@@ -54,4 +54,20 @@ public static String readKey(String regKey) {
     }
     return null;
   }
+  
+  public static boolean checkRegistryKey(String baseKey, String key) {
+    try {
+      Process process = Runtime.getRuntime().exec(REGQUERY_UTIL + baseKey + " /f" + key);
+      StreamReader reader = new StreamReader(process.getInputStream());
+      reader.start();
+      process.waitFor();
+      reader.join();
+      String result = reader.getResult();
+      int p = result.indexOf(baseKey + '\\' + key);
+      return (p != -1);
+    } catch (Exception e) {
+      logger.log(Level.SEVERE, MessageUtil.getMessage("error.reading.registry"), e);
+    }
+    return false;
+  }
 }

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

@@ -1,25 +1,22 @@
 /**
  * Copyright (C) 2000 - 2009 Silverpeas
  *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify it under the terms of the
+ * GNU Affero General Public License as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *
- * As a special exception to the terms and conditions of version 3.0 of
- * the GPL, you may redistribute this Program in connection with Free/Libre
- * Open Source Software ("FLOSS") applications as described in Silverpeas's
- * FLOSS exception.  You should have received a copy of the text describing
- * the FLOSS exception, and it is also available here:
+ * As a special exception to the terms and conditions of version 3.0 of the GPL, you may
+ * redistribute this Program in connection with Free/Libre Open Source Software ("FLOSS")
+ * applications as described in Silverpeas's FLOSS exception. You should have received a copy of the
+ * text describing the FLOSS exception, and it is also available here:
  * "http://repository.silverpeas.com/legal/licensing"
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Affero General Public License along with this program.
+ * If not, see <http://www.gnu.org/licenses/>.
  */
 package org.silverpeas.openoffice.windows;
 
@@ -43,8 +40,10 @@ public class MsOfficeRegistryHelper implements OfficeFinder {
   static final String POWERPOINT = "Powerpoint.Application";
   static final String WORD = "Word.Application";
   static final String FRONTPAGE = "FrontPage.Application";
+  static final String BASE_KEY_OFFICE = "\"HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Office\\";
   static final String BASE_APPLICATION_KEY = "\"HKEY_LOCAL_MACHINE\\Software\\Classes\\";
-  static final String BASE_KEY_64_CLSID = "\"HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\Classes\\CLSID\\";
+  static final String BASE_KEY_64_CLSID =
+      "\"HKEY_LOCAL_MACHINE\\Software\\Wow6432Node\\Classes\\CLSID\\";
   static final String BASE_KEY_CLSID = "\"HKEY_LOCAL_MACHINE\\Software\\Classes\\CLSID\\";
   static final Pattern AUTOMATION = Pattern.compile(
       "\\s*/[aA][uU][tT][oO][mM][aA][tT][iI][oO][nN]\\s*");
@@ -61,7 +60,11 @@ protected String getPath(String type) {
         path = RegistryKeyReader.readKey(BASE_KEY_64_CLSID + clsid + "\\LocalServer32\"");
       }
       if (path != null) {
-        return '"' + extractPath(path) + '"';
+        String extractedPath = extractPath(path);
+        if (!extractedPath.startsWith("\"")) {
+          extractedPath = '"' + extractedPath + '"';
+        }
+        return extractedPath;
       }
     }
     return null;

src/main/java/org/silverpeas/openoffice/windows/MsOfficeRegistryHelper.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", "3.6"};
+  private static final String[] VERSIONS = new String[]{"3.5", "3.6", "4.0"};
   private static final String GLOBAL_LIBRE_OFFICE_FOLDER =
       "\"HKEY_LOCAL_MACHINE\\SOFTWARE\\LibreOffice\\LibreOffice\\";
   private static final String GLOBAL_LIBRE_OFFICE_FOLDER_64 =