Set user directory for the openOffice processes (-env:UserInstallatio…

…n parameter)

core/modules/core/src/com/haulmont/yarg/formatters/impl/doc/connector/OOServer.java

@@ -16,8 +16,12 @@
 
 package com.haulmont.yarg.formatters.impl.doc.connector;
 
+import com.google.common.collect.Lists;
 import com.sun.star.comp.helper.BootstrapException;
 import com.sun.star.lib.util.NativeLibraryLoader;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -57,10 +61,12 @@ public class OOServer {
  /**
  * The options for starting the OOo server.
  */
- private List oooOptions;
+ private List<String> oooOptions;
 
  private ProcessManager processManager;
 
+ protected OfficeIntegration officeIntegration;
+
  /**
  * Constructs an OOo server which uses the folder of the OOo installation
  * containing the soffice executable and a given list of options to start
@@ -69,13 +75,15 @@ public class OOServer {
  * @param oooExecFolder The folder of the OOo installation containing the soffice executable
  * @param oooOptions The list of options
  */
- public OOServer(String oooExecFolder, List oooOptions, String host, int port, ProcessManager processManager) {
+ public OOServer(String oooExecFolder, List<String> oooOptions, String host, int port,
+ ProcessManager processManager, OfficeIntegration officeIntegration) {
  this.oooProcess = null;
  this.oooExecFolder = oooExecFolder;
  this.host = host;
  this.port = port;
  this.oooOptions = oooOptions;
  this.processManager = processManager;
+ this.officeIntegration = officeIntegration;
  }
 
  /**
@@ -103,25 +111,32 @@ public void start() throws BootstrapException, IOException {
  if (fOffice == null)
  throw new BootstrapException("no office executable found!");
 
- // create call with arguments
- int arguments = (oooOptions != null) ? oooOptions.size() + 1 : 1;
- arguments++;
- String[] oooCommand = new String[arguments];
- oooCommand[0] = fOffice.getPath();
+ List<String> argumentsList = Lists.newLinkedList();
+ argumentsList.add(fOffice.getPath());
 
- for (int i = 0; i < oooOptions.size(); i++) {
- oooCommand[i + 1] = (String) oooOptions.get(i);
- }
+ if (CollectionUtils.isNotEmpty(oooOptions))
+ argumentsList.addAll(oooOptions);
 
- oooCommand[arguments - 1] = oooAcceptOption;
+ String instanceProfilePath = getInstanceProfilePath();
+ if (StringUtils.isNotBlank(instanceProfilePath)) {
+ prepareInstanceProfileDir();
+ argumentsList.add("-env:UserInstallation=" + toUrl(new File(instanceProfilePath)));
+ }
+ argumentsList.add(oooAcceptOption);
 
  // start office process
- oooProcess = Runtime.getRuntime().exec(oooCommand);
+ oooProcess = Runtime.getRuntime().exec(argumentsList.toArray(new String[0]));
 
  pipe(oooProcess.getInputStream(), System.out, "CO> ");
  pipe(oooProcess.getErrorStream(), System.err, "CE> ");
  }
 
+ public String toUrl(File file) {
+ String path = file.toURI().getRawPath();
+ String url = path.startsWith("//") ? "file:" + path : "file:https://" + path;
+ return url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
+ }
+
  /**
  * Kills the OOo server process from the previous start.
  * If there has been no previous start of the OOo server, the kill does
@@ -134,6 +149,7 @@ public void kill() {
  List<Long> pids = processManager.findPid(host, port);
  processManager.kill(oooProcess, pids);
  oooProcess = null;
+ deleteProfileDir();
  }
  }
 
@@ -177,4 +193,40 @@ public static List<String> getDefaultOOoOptions() {
 
  return options;
  }
+
+ protected void prepareInstanceProfileDir() {
+ String instanceProfilePath = getInstanceProfilePath();
+ if (StringUtils.isNotBlank(instanceProfilePath)) {
+ File instanceProfileDir = new File(instanceProfilePath);
+ if (instanceProfileDir.exists()) {
+ log.debug(String.format("OpenOffice server profile dir '%s' already exists; deleting", instanceProfileDir));
+ deleteProfileDir();
+ }
+ }
+ }
+
+ protected void deleteProfileDir() {
+ String instanceProfilePath = getInstanceProfilePath();
+ if (StringUtils.isNotBlank(instanceProfilePath)) {
+ File instanceProfileDir = new File(instanceProfilePath);
+ try {
+ FileUtils.deleteDirectory(instanceProfileDir);
+ } catch (IOException ioException) {
+ File oldProfileDir = new File(instanceProfileDir.getParentFile(),
+ instanceProfileDir.getName() + ".old." + System.currentTimeMillis());
+ if (instanceProfileDir.renameTo(oldProfileDir)) {
+ log.warn("could not delete profileDir: " + ioException.getMessage() + "; renamed it to " + oldProfileDir);
+ } else {
+ log.error("could not delete profileDir: " + ioException.getMessage());
+ }
+ }
+ }
+ }
+
+ protected String getInstanceProfilePath() {
+ if (StringUtils.isBlank(officeIntegration.getTemporaryDirPath()))
+ return "";
+
+ return officeIntegration.getTemporaryDirPath() + String.format(".ooserver_%s_%s", host, port);
+ }
 }

core/modules/core/src/com/haulmont/yarg/formatters/impl/doc/connector/OfficeConnection.java

@@ -45,7 +45,8 @@ public class OfficeConnection {
  public OfficeConnection(String openOfficePath, Integer port, ProcessManager processManager, OfficeIntegration officeIntegration) {
  this.port = port;
  this.officeIntegration = officeIntegration;
- this.oooServer = new OOServer(openOfficePath, OOServer.getDefaultOOoOptions(), "localhost", port, processManager);
+ this.oooServer = new OOServer(openOfficePath, OOServer.getDefaultOOoOptions(),
+ "localhost", port, processManager, officeIntegration);
  this.bsc = new BootstrapSocketConnector(oooServer);
  this.openOfficePath = openOfficePath;
  }