Trying to launch Ms Office on Mac

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

Author: Emmanuel Hugonnet

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

@@ -53,7 +53,7 @@ public class Launcher {
   /**
    * @param args the command line arguments
    */
-  public static void main(String[] args) throws OfficeNotFoundException {
+  public static void main(final String[] args) throws OfficeNotFoundException {
     logger.log(Level.INFO,
         MessageUtil.getMessage("app.title") + " version " + LAUNCHER_VERSION);
     logger.log(Level.INFO, MessageUtil.getMessage("info.url.encoded") + args[0]);

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

@@ -82,9 +82,13 @@ public static int launch(String path, String url, boolean modeDisconnected,
     logger.log(Level.INFO, "The command line: " + path + ' ' + url);
     if (modeDisconnected) {
       try {
-        FileWebDavAccessManager webdavAccessManager = new FileWebDavAccessManager(auth);
-        url = url.substring(1, url.length() - 1);
-        String tmpFilePath = webdavAccessManager.retrieveFile(url);
+        String webdavUrl = url;
+        final FileWebDavAccessManager webdavAccessManager = new FileWebDavAccessManager(auth);
+        if ('"' == url.charAt(0)) {
+          webdavUrl = url.substring(1, url.length() - 1);
+        }
+        String tmpFilePath = webdavAccessManager.retrieveFile(webdavUrl);
+        logger.log(Level.INFO, "The exact exec line: " + path + ' ' + tmpFilePath);
         Process process = Runtime.getRuntime().exec(path + ' ' + tmpFilePath);
         process.waitFor();
         webdavAccessManager.pushFile(tmpFilePath, url);

src/main/java/com/silverpeas/openoffice/macosx/MacOsOfficeFinder.java

@@ -31,12 +31,16 @@
 import com.silverpeas.openoffice.OfficeNotFoundException;
 import com.silverpeas.openoffice.OpenOfficeFinder;
 import java.io.File;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * @author ehugonnet
  */
 public class MacOsOfficeFinder implements OfficeFinder {
 
+  static Logger logger = Logger.getLogger(MacOsOfficeFinder.class.getName());
+
   protected static final OpenOfficeFinder finder = new WhereisMacHelper();
   protected static final String OFFICE_PATH =
       "/Applications/Microsoft Office 2008/";
@@ -73,7 +77,7 @@ public String findWordEditor() throws OfficeNotFoundException {
 
   @Override
   public String findOther() throws OfficeNotFoundException {
-    throw new UnsupportedOperationException("Not supported yet.");
+    return finder.findOther();
   }
 
   @Override
@@ -83,6 +87,7 @@ public boolean isMicrosoftOffice2007() {
 
   protected boolean isMsOfficePresent() {
     File officeDir = new File(OFFICE_PATH);
+    logger.log(Level.INFO, "Looking for file " + OFFICE_PATH + " but found " + officeDir.exists());
     return officeDir.exists();
   }
 

src/main/java/com/silverpeas/openoffice/util/FinderFactory.java

@@ -39,7 +39,7 @@
  */
 public class FinderFactory {
 
-  public static OfficeFinder getFinder(MsOfficeType contentType) {
+  public static OfficeFinder getFinder(final MsOfficeType contentType) {
     OsEnum os = OsEnum.getOS(System.getProperty("os.name"));
     switch (os) {
       case WINDOWS_XP:
@@ -51,7 +51,7 @@ public static OfficeFinder getFinder(MsOfficeType contentType) {
       case LINUX:
         return new WhereisHelper();
       case MAC_OSX:
-        return new WhereisMacHelper();
+        return new MacOsOfficeFinder();
       default:
         return new WhereisHelper();
     }