results)
+ {
+ this.results = results;
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java b/src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java
new file mode 100644
index 0000000000..6dc6dd53f6
--- /dev/null
+++ b/src/main/java/org/alfresco/repo/content/transform/JodContentTransformer.java
@@ -0,0 +1,82 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.content.transform;
+
+import java.io.File;
+
+import org.artofsolving.jodconverter.document.DocumentFormat;
+
+import org.alfresco.repo.content.JodConverter;
+import org.alfresco.repo.content.transform.ContentTransformerWorker;
+import org.alfresco.repo.content.transform.OOoContentTransformerHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.artofsolving.jodconverter.OfficeDocumentConverter;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * Makes use of the {@link http://code.google.com/p/jodconverter/} library and an installed
+ * OpenOffice application to perform OpenOffice-driven conversions.
+ *
+ * @author Neil McErlean
+ */
+public class JodContentTransformer extends OOoContentTransformerHelper implements ContentTransformerWorker, InitializingBean
+{
+ private static Log logger = LogFactory.getLog(JodContentTransformer.class);
+
+ private JodConverter jodconverter;
+
+ public void setJodConverter(JodConverter jodc)
+ {
+ this.jodconverter = jodc;
+ }
+
+ @Override
+ protected Log getLogger()
+ {
+ return logger;
+ }
+
+ @Override
+ protected String getTempFilePrefix()
+ {
+ return "JodContentTransformer";
+ }
+
+ @Override
+ public boolean isAvailable()
+ {
+ return jodconverter.isAvailable();
+ }
+
+ @Override
+ protected void convert(File tempFromFile, DocumentFormat sourceFormat, File tempToFile,
+ DocumentFormat targetFormat)
+ {
+ OfficeDocumentConverter converter = new OfficeDocumentConverter(jodconverter.getOfficeManager());
+ converter.convert(tempFromFile, tempToFile);
+ }
+}
diff --git a/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java b/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java
index 51ac27a5a4..107548d07c 100644
--- a/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java
+++ b/src/main/java/org/alfresco/repo/content/transform/OOoContentTransformerHelper.java
@@ -36,11 +36,11 @@ import java.io.Reader;
import java.io.Writer;
import com.sun.star.task.ErrorCodeIOException;
-import net.sf.jooreports.converter.DocumentFamily;
-import net.sf.jooreports.converter.DocumentFormat;
-import net.sf.jooreports.converter.DocumentFormatRegistry;
-import net.sf.jooreports.converter.XmlDocumentFormatRegistry;
-import net.sf.jooreports.openoffice.connection.OpenOfficeException;
+import org.artofsolving.jodconverter.document.DefaultDocumentFormatRegistry;
+import org.artofsolving.jodconverter.document.DocumentFamily;
+import org.artofsolving.jodconverter.document.DocumentFormat;
+import org.artofsolving.jodconverter.document.DocumentFormatRegistry;
+import org.artofsolving.jodconverter.document.JsonDocumentFormatRegistry;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.repo.content.MimetypeMap;
@@ -55,6 +55,7 @@ import org.apache.pdfbox.exceptions.COSVisitorException;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
+import org.artofsolving.jodconverter.office.OfficeException;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.util.FileCopyUtils;
@@ -107,7 +108,7 @@ public abstract class OOoContentTransformerHelper extends ContentTransformerHelp
try
{
InputStream is = resourceLoader.getResource(this.documentFormatsConfiguration).getInputStream();
- formatRegistry = new XmlDocumentFormatRegistry(is);
+ formatRegistry = new JsonDocumentFormatRegistry(is);
// We do not need to explicitly close this InputStream as it is closed for us within the XmlDocumentFormatRegistry
}
catch (IOException e)
@@ -119,7 +120,7 @@ public abstract class OOoContentTransformerHelper extends ContentTransformerHelp
}
else
{
- formatRegistry = new XmlDocumentFormatRegistry();
+ formatRegistry = new DefaultDocumentFormatRegistry();
}
}
@@ -187,14 +188,14 @@ public abstract class OOoContentTransformerHelper extends ContentTransformerHelp
String sourceExtension = mimetypeService.getExtension(sourceMimetype);
String targetExtension = mimetypeService.getExtension(targetMimetype);
// query the registry for the source format
- DocumentFormat sourceFormat = formatRegistry.getFormatByFileExtension(sourceExtension);
+ DocumentFormat sourceFormat = formatRegistry.getFormatByExtension(sourceExtension);
if (sourceFormat == null)
{
// no document format
return false;
}
// query the registry for the target format
- DocumentFormat targetFormat = formatRegistry.getFormatByFileExtension(targetExtension);
+ DocumentFormat targetFormat = formatRegistry.getFormatByExtension(targetExtension);
if (targetFormat == null)
{
// no document format
@@ -202,17 +203,10 @@ public abstract class OOoContentTransformerHelper extends ContentTransformerHelp
}
// get the family of the target document
- DocumentFamily sourceFamily = sourceFormat.getFamily();
+ DocumentFamily sourceFamily = sourceFormat.getInputFamily();
// does the format support the conversion
- if (!targetFormat.isExportableFrom(sourceFamily))
- {
- // unable to export from source family of documents to the target format
- return false;
- }
- else
- {
- return true;
- }
+ boolean transformable = formatRegistry.getOutputFormats(sourceFamily).contains(targetFormat); // same as: targetFormat.getStoreProperties(sourceFamily) != null
+ return transformable;
}
@Override
@@ -319,23 +313,23 @@ public abstract class OOoContentTransformerHelper extends ContentTransformerHelp
String sourceExtension = mimetypeService.getExtension(sourceMimetype);
String targetExtension = mimetypeService.getExtension(targetMimetype);
// query the registry for the source format
- DocumentFormat sourceFormat = formatRegistry.getFormatByFileExtension(sourceExtension);
+ DocumentFormat sourceFormat = formatRegistry.getFormatByExtension(sourceExtension);
if (sourceFormat == null)
{
// source format is not recognised
throw new ContentIOException("No OpenOffice document format for source extension: " + sourceExtension);
}
// query the registry for the target format
- DocumentFormat targetFormat = formatRegistry.getFormatByFileExtension(targetExtension);
+ DocumentFormat targetFormat = formatRegistry.getFormatByExtension(targetExtension);
if (targetFormat == null)
{
// target format is not recognised
throw new ContentIOException("No OpenOffice document format for target extension: " + targetExtension);
}
// get the family of the target document
- DocumentFamily sourceFamily = sourceFormat.getFamily();
+ DocumentFamily sourceFamily = sourceFormat.getInputFamily();
// does the format support the conversion
- if (!targetFormat.isExportableFrom(sourceFamily))
+ if (!formatRegistry.getOutputFormats(sourceFamily).contains(targetFormat)) // same as: targetFormat.getStoreProperties(sourceFamily) == null
{
throw new ContentIOException(
"OpenOffice conversion not supported: \n" +
@@ -376,7 +370,7 @@ public abstract class OOoContentTransformerHelper extends ContentTransformerHelp
{
convert(tempFromFile, sourceFormat, tempToFile, targetFormat);
}
- catch (OpenOfficeException e)
+ catch (OfficeException e)
{
throw new ContentIOException("OpenOffice server conversion failed: \n" +
" reader: " + reader + "\n" +
diff --git a/src/main/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java b/src/main/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java
deleted file mode 100644
index 3168951e4c..0000000000
--- a/src/main/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerWorker.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.repo.content.transform;
-
-import java.io.File;
-
-import net.sf.jooreports.converter.DocumentFormat;
-import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
-import net.sf.jooreports.openoffice.converter.AbstractOpenOfficeDocumentConverter;
-import net.sf.jooreports.openoffice.converter.OpenOfficeDocumentConverter;
-
-import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.service.cmr.repository.ContentIOException;
-import org.alfresco.service.cmr.repository.ContentReader;
-import org.alfresco.util.PropertyCheck;
-import org.alfresco.util.SocketOpenOfficeConnection;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * Makes use of the JOOConverter library to perform
- * OpenOffice-driven conversions.
- * This requires that OpenOffice be running, but delivers a wider range of transformations
- * than Tika is able to (Tika just translates into Text, HTML and XML)
- *
- * @author Derek Hulley
- */
-public class OpenOfficeContentTransformerWorker extends OOoContentTransformerHelper implements ContentTransformerWorker, InitializingBean
-{
- private static Log logger = LogFactory.getLog(OpenOfficeContentTransformerWorker.class);
-
- private OpenOfficeConnection connection;
- private AbstractOpenOfficeDocumentConverter converter;
-
- /**
- * @param connection
- * the connection that the converter uses
- */
- public void setConnection(OpenOfficeConnection connection)
- {
- this.connection = connection;
- }
-
- /**
- * Explicitly set the converter to be used. The converter must use the same connection set in
- * {@link #setConnection(OpenOfficeConnection)}.
- *
- * If not set, then the OpenOfficeDocumentConverter will be used.
- *
- * @param converter
- * the converter to use.
- */
- public void setConverter(AbstractOpenOfficeDocumentConverter converter)
- {
- this.converter = converter;
- }
-
- @Override
- protected Log getLogger()
- {
- return logger;
- }
-
- @Override
- protected String getTempFilePrefix()
- {
- return "OpenOfficeContentTransformer";
- }
-
- @Override
- public boolean isAvailable()
- {
- return connection.isConnected();
- }
-
- @Override
- public void afterPropertiesSet() throws Exception
- {
- PropertyCheck.mandatory("OpenOfficeContentTransformerWorker", "connection", connection);
-
- super.afterPropertiesSet();
-
- // set up the converter
- if (converter == null)
- {
- converter = getDefaultConverter(connection);
- }
- }
-
- protected AbstractOpenOfficeDocumentConverter getDefaultConverter(OpenOfficeConnection connection)
- {
- return (connection instanceof SocketOpenOfficeConnection)
- ? ((SocketOpenOfficeConnection)connection).getDefaultConverter()
- : new OpenOfficeDocumentConverter(connection);
- }
-
- @Override
- protected void convert(File tempFromFile, DocumentFormat sourceFormat, File tempToFile,
- DocumentFormat targetFormat)
- {
- converter.convert(tempFromFile, sourceFormat, tempToFile, targetFormat);
- }
-
- public void saveContentInFile(String sourceMimetype, ContentReader reader, File file) throws ContentIOException
- {
- // jooconverter does not handle non western chars by default in text files.
- // Jodconverter does by setting properties it passes to soffice.
- // The following patched method added to jooconverter, addes these properties.
- converter.setTextUtf8(MimetypeMap.MIMETYPE_TEXT_PLAIN.equals(sourceMimetype));
-
- super.saveContentInFile(sourceMimetype, reader, file);
- }
-}
diff --git a/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java b/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
index 71de679ff1..8d00f0b1d5 100644
--- a/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
+++ b/src/main/java/org/alfresco/repo/content/transform/ProxyContentTransformer.java
@@ -1,31 +1,31 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.content.transform;
-import net.sf.jooreports.converter.DocumentFormatRegistry;
+import org.artofsolving.jodconverter.document.DocumentFormatRegistry;
import org.alfresco.api.AlfrescoPublicApi;
import org.alfresco.service.cmr.repository.ContentReader;
diff --git a/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java b/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java
index f66a61cb89..7652a805f2 100644
--- a/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java
+++ b/src/main/java/org/alfresco/repo/content/transform/TransformerProperties.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.content.transform;
import java.io.IOException;
@@ -52,7 +52,10 @@ public class TransformerProperties
private static final String TRANSFORMERS_PROPERTIES = "alfresco/subsystems/Transformers/default/transformers.properties";
private static Log logger = LogFactory.getLog(TransformerProperties.class);
-
+
+ private static final String JOD_CONVERTER = ".JodConverter.";
+ private static final String OPEN_OFFICE = ".OpenOffice.";
+
private final ChildApplicationContextFactory subsystem;
private final Properties globalProperties;
@@ -69,6 +72,12 @@ public class TransformerProperties
if (value == null)
{
value = globalProperties.getProperty(name);
+
+ if (value == null)
+ {
+ name = alias(name, JOD_CONVERTER, OPEN_OFFICE);
+ value = globalProperties.getProperty(name);
+ }
}
return value;
}
@@ -98,21 +107,44 @@ public class TransformerProperties
}
return defaultProperties;
}
-
+
public Set getPropertyNames()
{
Set propertyNames = new HashSet(subsystem.getPropertyNames());
for (String name: globalProperties.stringPropertyNames())
{
- if (name.startsWith(TransformerConfig.PREFIX) && !propertyNames.contains(name))
+ if (name.startsWith(TransformerConfig.PREFIX))
{
- propertyNames.add(name);
+ name = alias(name, OPEN_OFFICE, JOD_CONVERTER);
+ if (!propertyNames.contains(name))
+ {
+ propertyNames.add(name);
+ }
}
}
return propertyNames;
- }
-
+ }
+
+ // When we moved the JodConverter into the Community edition (after 6.0.0-ea) we wanted to allow any Community
+ // settings for content.transformer.OpenOffice (and related pipeline transformers specified) in
+ // alfresco.global.properties to apply to the JodConverter (and related pipeline transformers), but where there
+ // is jodConverter that value should be used.
+ // content.transformer.JodConverter.
+ // content.transformer.JodConverter.Html2Pdf.
+ // content.transformer.JodConverter.2Pdf.
+ // content.transformer.complex.JodConverter.Image.
+ // content.transformer.complex.JodConverter.PdfBox
+ private String alias(String name, String from, String to)
+ {
+ int i = name.indexOf(from);
+ if (i != -1)
+ {
+ name = name.substring(0, i) + to + name.substring(i+from.length());
+ }
+ return name;
+ }
+
public void setProperties(Map map)
{
subsystem.setProperties(map);
diff --git a/src/main/java/org/alfresco/util/JodConfigImpl.java b/src/main/java/org/alfresco/util/JodConfigImpl.java
deleted file mode 100644
index 565a7866b5..0000000000
--- a/src/main/java/org/alfresco/util/JodConfigImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * Implementation that supplies OOoJodconverter subsystems config parameters that might clash with the OOoDirect subsystem.
- *
- * @author Alan Davis
- */
-public class JodConfigImpl implements JodConfig
-{
- private String ports;
- private boolean enabled;
-
- @Override
- public Collection getPortsCollection()
- {
- return Arrays.asList(ports.trim().split("[, ][, ]*"));
- }
-
- @Override
- public String getPorts()
- {
- return getPortsCollection().toString().replaceAll("[ \\[\\]]", "");
- }
-
- @Override
- public void setPorts(String ports)
- {
- this.ports = ports;
- }
-
- @Override
- public boolean isEnabled()
- {
- return enabled;
- }
-
- @Override
- public void setEnabled(boolean enabled)
- {
- this.enabled = enabled;
- }
-}
diff --git a/src/main/java/org/alfresco/util/JodCoordination.java b/src/main/java/org/alfresco/util/JodCoordination.java
deleted file mode 100644
index 2483d46548..0000000000
--- a/src/main/java/org/alfresco/util/JodCoordination.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * Class coordinates with the OOoJodconverter subsystem so that the OOoDirect subsystem does not
- * start up its own soffice process it that would clash with the JOD one. It also does not make a
- * connection to a JOD started soffice process.
- *
- * @author Alan Davis
- */
-public class JodCoordination
-{
- private static Log logger = LogFactory.getLog(JodCoordination.class);
-
- private Boolean start;
-
- private boolean oooEnabled;
- private boolean oooLocalhost;
- private String oooPort;
- private JodConfig jodConfig;
-
- public void setOooEnabled(boolean oooEnabled)
- {
- this.oooEnabled = oooEnabled;
- }
-
- public void setOooHost(String oooHost)
- {
- oooLocalhost = oooHost == null || oooHost.equals(SocketOpenOfficeConnection.DEFAULT_HOST);
- }
-
- public void setOooPort(String oooPort)
- {
- this.oooPort = oooPort;
- }
-
- public void setJodConfig(JodConfig jodConfig)
- {
- this.jodConfig = jodConfig;
- }
-
- /**
- * Returns {@code true} if the direct OOo should be started. This should not take
- * place if both direct ooo and jod are enabled and using the same port.
- */
- public boolean startOpenOffice()
- {
- if (start == null)
- {
- if (logger.isDebugEnabled())
- {
- logger.debug("OOoJodconverter subsystem will "+
- (jodConfig.isEnabled() ? "" : "NOT ") + "start an OpenOffice process");
- }
-
- start = oooEnabled && oooLocalhost;
- if (start)
- {
- if (jodConfig.isEnabled() && jodConfig.getPortsCollection().contains(oooPort))
- {
- start = false;
- logger.error("Both OOoDirect and OOoJodconverter subsystems are enabled and have specified " +
- "the same port number on the localhost.");
- logger.error(" ooo.enabled=true");
- logger.error(" ooo.host=localhost");
- logger.error(" ooo.port=" + oooPort);
- logger.error(" jodconverter.portNumbers=" + jodConfig.getPorts());
- logger.error(" jodconverter.enabled=true");
- logger.error("The OOoDirect subsystem will not start its OpenOffice process as a result.");
- }
- else
- {
- logger.debug("OOoDirect subsystem will start an OpenOffice process");
- }
- }
- else
- {
- logger.debug("OOoDirect subsystem will NOT start an OpenOffice process");
- }
- }
- return start;
- }
-
- /**
- * Returns {@code true} if the direct OOo connection listener should be started. This
- * should only take place if a remote host is being used or the direct OOo will be started
- * on the local host.
- */
- public boolean startListener()
- {
- return (oooEnabled && !oooLocalhost) || startOpenOffice();
- }
-}
diff --git a/src/main/java/org/alfresco/util/JodCoordinationBoolean.java b/src/main/java/org/alfresco/util/JodCoordinationBoolean.java
deleted file mode 100644
index 271de68a16..0000000000
--- a/src/main/java/org/alfresco/util/JodCoordinationBoolean.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import org.alfresco.util.bean.BooleanBean;
-
-/**
- * Wraps a {@link org.alfresco.util.JodCoordination} object to return one of its boolean methods,
- * so that it may be used as the input to another bean.
- *
- * @author Alan Davis
- */
-public class JodCoordinationBoolean implements BooleanBean
-{
- private JodCoordination jodCoordination;
- private String returnValue;
-
- public void setJodCoordination(JodCoordination jodCoordination)
- {
- this.jodCoordination = jodCoordination;
- }
-
- public void setReturnValue(String returnValue)
- {
- this.returnValue = returnValue;
- }
-
- @Override
- public boolean isTrue()
- {
- if ("startOpenOffice".equals(returnValue))
- {
- return jodCoordination.startOpenOffice();
- }
- else if ("startListener".equals(returnValue))
- {
- return jodCoordination.startListener();
- }
- else
- {
- throw new IllegalArgumentException("Expected \"startOpenOffice\" or \"startListener\" " +
- "as the returnValue property, but it was \""+returnValue+"\"");
- }
- }
-}
diff --git a/src/main/java/org/alfresco/util/OpenOfficeCommandEnv.java b/src/main/java/org/alfresco/util/OpenOfficeCommandEnv.java
deleted file mode 100644
index e96b45fbaf..0000000000
--- a/src/main/java/org/alfresco/util/OpenOfficeCommandEnv.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.util.OpenOfficeURI;
-import org.alfresco.util.exec.RuntimeExec;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-/**
- * A map giving the environment openoffice or libreoffice commands require to start.
- *
- * @author Alan Davis
- */
-public class OpenOfficeCommandEnv extends AbstractMap
-{
- private static final Log logger = LogFactory.getLog(OpenOfficeCommandLine.class);
- private static final String DYLD_LIBRARY_PATH = "DYLD_LIBRARY_PATH";
-
- private Map map = new HashMap(System.getenv());
- private OpenOfficeVariant variant = new OpenOfficeVariant();
-
- public OpenOfficeCommandEnv(String exe) throws IOException
- {
- if (variant.isMac())
- {
- map.remove(DYLD_LIBRARY_PATH);
- logger.debug("Removing $DYLD_LIBRARY_PATH from the environment so that LibreOffice/OpenOffice will start on Mac.");
- }
- }
-
- @Override
- public Set> entrySet()
- {
- return map.entrySet();
- }
-}
diff --git a/src/main/java/org/alfresco/util/OpenOfficeConnectionEvent.java b/src/main/java/org/alfresco/util/OpenOfficeConnectionEvent.java
deleted file mode 100644
index e6a517dfdc..0000000000
--- a/src/main/java/org/alfresco/util/OpenOfficeConnectionEvent.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import java.util.Map;
-
-import org.springframework.context.ApplicationEvent;
-
-/**
- * A class of event that notifies the listener of the status of the Open Office Connection. Useful for Monitoring
- * purposes.
- *
- * @author dward
- */
-public class OpenOfficeConnectionEvent extends ApplicationEvent
-{
- private static final long serialVersionUID = 8834274840220309384L;
-
- /**
- * The Constructor.
- *
- * @param metaData
- * the meta data map
- */
- public OpenOfficeConnectionEvent(Map metaData)
- {
- super(metaData);
- }
-
- /**
- * Gets the meta data map.
- *
- * @return the meta data map
- */
- @SuppressWarnings("unchecked")
- public Map getMetaData()
- {
- return (Map) getSource();
- }
-}
diff --git a/src/main/java/org/alfresco/util/OpenOfficeConnectionTester.java b/src/main/java/org/alfresco/util/OpenOfficeConnectionTester.java
deleted file mode 100644
index 44e412e09d..0000000000
--- a/src/main/java/org/alfresco/util/OpenOfficeConnectionTester.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import java.lang.reflect.Method;
-import java.net.ConnectException;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.concurrent.Semaphore;
-
-import net.sf.jooreports.openoffice.connection.AbstractOpenOfficeConnection;
-import net.sf.jooreports.openoffice.connection.OpenOfficeConnection;
-
-import org.alfresco.error.AlfrescoRuntimeException;
-import org.alfresco.repo.content.metadata.MetadataExtracterRegistry;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.quartz.Job;
-import org.quartz.JobDataMap;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationEvent;
-import org.springframework.extensions.surf.util.AbstractLifecycleBean;
-import org.springframework.extensions.surf.util.I18NUtil;
-
-import com.sun.star.registry.RegistryValueType;
-import com.sun.star.registry.XRegistryKey;
-import com.sun.star.registry.XSimpleRegistry;
-import com.sun.star.uno.UnoRuntime;
-
-/**
- * A bootstrap class that checks for the presence of a valid OpenOffice connection, as provided by the
- * net.sf.jooreports.openoffice.connection.OpenOfficeConnection implementations.
- *
- * @author Derek Hulley
- */
-public class OpenOfficeConnectionTester extends AbstractLifecycleBean
-{
- private static final String ATTRIBUTE_AVAILABLE = "available";
- private static final String INFO_CONNECTION_VERIFIED = "system.openoffice.info.connection_verified";
- private static final String ERR_CONNECTION_FAILED = "system.openoffice.err.connection_failed";
- private static final String ERR_CONNECTION_LOST = "system.openoffice.err.connection_lost";
- private static final String ERR_CONNECTION_REMADE = "system.openoffice.err.connection_remade";
-
- private static Log logger = LogFactory.getLog(OpenOfficeConnectionTester.class);
-
- private OpenOfficeConnection connection;
- private Map openOfficeMetadata = new TreeMap();
- private boolean strict;
-
- private Semaphore singleThreadSemaphore = new Semaphore(1);
-
- public OpenOfficeConnectionTester()
- {
- this.strict = false;
- }
-
- /**
- * @param connection the OpenOffice connection.
- */
- public void setConnection(OpenOfficeConnection connection)
- {
- this.connection = connection;
- }
-
- /**
- * @param strict set to true to generate a failure if the connection is not connected
- * during the {@link #checkConnection() connection check}, or false to just issue
- * a warning. The default is false.
- */
- public void setStrict(boolean strict)
- {
- this.strict = strict;
- }
-
- /**
- * @see #checkConnection()
- */
- @Override
- protected void onBootstrap(ApplicationEvent event)
- {
- if (connection instanceof SocketOpenOfficeConnection && ((SocketOpenOfficeConnection)connection).isEnabled())
- {
- checkConnection();
- ((ApplicationContext) event.getSource()).publishEvent(new OpenOfficeConnectionEvent(this.openOfficeMetadata));
- }
- }
-
- /**
- * Disconnect
- */
- @Override
- protected void onShutdown(ApplicationEvent event)
- {
- if(connection != null)
- {
- if(connection.isConnected())
- {
- connection.disconnect();
- }
- }
- }
-
- /**
- * Perform the actual connection check. If this component is {@link #setStrict(boolean) strict},
- * then a disconnected {@link #setConnection(OpenOfficeConnection) connection} will result in a
- * runtime exception being generated.
- */
- private void checkConnection()
- {
- String connectedMessage = I18NUtil.getMessage(INFO_CONNECTION_VERIFIED);
- boolean connected = testAndConnect();
- OpenOfficeConnectionTesterJob.wasConnected = Boolean.valueOf(connected);
- if (connected)
- {
- // the connection is fine
- logger.debug(connectedMessage);
- return;
- }
- // now we have to either fail or report the connection
- String msg = I18NUtil.getMessage(ERR_CONNECTION_FAILED);
- if (strict)
- {
- throw new AlfrescoRuntimeException(msg);
- }
- else
- {
- logger.warn(msg);
- }
- }
-
- /**
- * Calls {@link #testAndConnect()} if no other Threads are currently calling it.
- * As a result we should NOT get a queue of Threads from the Quartz scheduler hanging
- * one after another, if OpenOffice is taking a long time responding or waiting for the
- * connection timeout. This way we get one timeout rather than multiple timeouts. ALF-15406
- * @return {code null} if another Thread is checking the connection or the result from
- * {@link #testAndConnect()}.
- */
- public Boolean testAndConnectNoQueuing()
- {
- boolean checking = false;
- try
- {
- checking = singleThreadSemaphore.tryAcquire();
- return checking ? testAndConnect() : null;
- }
- finally
- {
- if (checking)
- {
- singleThreadSemaphore.release();
- }
- }
- }
-
- public boolean testAndConnect()
- {
- synchronized (this.openOfficeMetadata)
- {
- PropertyCheck.mandatory(this, "connection", connection);
- if (!connection.isConnected())
- {
- try
- {
- connection.connect();
- }
- catch (ConnectException e)
- {
- // No luck
- this.openOfficeMetadata.clear();
- this.openOfficeMetadata.put(ATTRIBUTE_AVAILABLE, Boolean.FALSE);
- return false;
- }
- }
-
- // Let's try to get at the version metadata
- Boolean lastAvailability = (Boolean)this.openOfficeMetadata.get(ATTRIBUTE_AVAILABLE);
- if (lastAvailability == null || !lastAvailability.booleanValue())
- {
- this.openOfficeMetadata.put(ATTRIBUTE_AVAILABLE, Boolean.TRUE);
- try
- {
- // We have to peak inside the connection class to get the service we want!
- Method getServiceMethod = AbstractOpenOfficeConnection.class.getDeclaredMethod("getService",
- String.class);
- getServiceMethod.setAccessible(true);
- Object configurationRegistry = getServiceMethod.invoke(connection,
- "com.sun.star.configuration.ConfigurationRegistry");
- XSimpleRegistry registry = (XSimpleRegistry) UnoRuntime.queryInterface(
- com.sun.star.registry.XSimpleRegistry.class, configurationRegistry);
- registry.open("org.openoffice.Setup", true, false);
- XRegistryKey root = registry.getRootKey();
- XRegistryKey product = root.openKey("Product");
- for (XRegistryKey key : product.openKeys())
- {
- switch (key.getValueType().getValue())
- {
- case RegistryValueType.LONG_value:
- openOfficeMetadata.put(key.getKeyName(), key.getLongValue());
- break;
- case RegistryValueType.ASCII_value:
- openOfficeMetadata.put(key.getKeyName(), key.getAsciiValue());
- break;
- case RegistryValueType.STRING_value:
- openOfficeMetadata.put(key.getKeyName(), key.getStringValue());
- break;
- }
- }
- registry.close();
- }
- catch (com.sun.star.uno.RuntimeException oooRuntimeException)
- {
- // ALF-5747 discusses an OOo problem whereby an interface component was not implemented & therefore version
- // information cannot be retrieved. This does not seem to affect the operation of the OOo process.
- // If we see this exception, which occurs in OOo 3.3.0, we'll shorten the exception log & make it friendlier.
-
- final String exceptionMessage = oooRuntimeException.getMessage();
- if (exceptionMessage != null && exceptionMessage.contains("com.sun.star.configuration.ConfigurationRegistry: not implemented"))
- {
- logger.warn("Error trying to query Open Office version information. " +
- "OpenOffice.org's ConfigurationRegistry not implemented in this version of OOo. This should not affect the operation of OOo.");
- // We have intentionally not logged the exception object here.
- }
- else
- {
- logger.warn("Error trying to query Open Office version information", oooRuntimeException);
- }
- }
- catch (Exception e)
- {
- logger.warn("Error trying to query Open Office version information", e);
- }
- }
- }
- return true;
- }
-
- /**
- * Quartz job that checks an OpenOffice connection.
- *
- * @author Derek Hulley
- * @since 2.1.2
- */
- public static class OpenOfficeConnectionTesterJob implements Job
- {
- private static volatile Boolean wasConnected;
-
- public OpenOfficeConnectionTesterJob()
- {
- }
-
- /**
- * Check the connection.
- * @see OpenOfficeConnectionTester#checkConnection()
- */
- public synchronized void execute(JobExecutionContext context) throws JobExecutionException
- {
- /*
- * Synchronized just in case of overzelous triggering.
- */
-
- JobDataMap jobData = context.getJobDetail().getJobDataMap();
- // Get the connecion tester
- Object openOfficeConnectionTesterObj = jobData.get("openOfficeConnectionTester");
- if (openOfficeConnectionTesterObj == null || !(openOfficeConnectionTesterObj instanceof OpenOfficeConnectionTester))
- {
- throw new AlfrescoRuntimeException("OpenOfficeConnectionJob data must contain valid 'openOfficeConnectionTester' reference");
- }
- OpenOfficeConnectionTester openOfficeConnectionTester = (OpenOfficeConnectionTester) openOfficeConnectionTesterObj;
-
- // Get the extractor and transformer registries. These are not mandatory.
- Object metadataExractorRegistryObj = jobData.get("metadataExractorRegistry");
- MetadataExtracterRegistry metadataExtracterRegistry = null;
- if (metadataExractorRegistryObj != null && (metadataExractorRegistryObj instanceof MetadataExtracterRegistry))
- {
- metadataExtracterRegistry = (MetadataExtracterRegistry) metadataExractorRegistryObj;
- }
-
- // Now ping the connection. It doesn't matter if it fails or not.
- // If there is another Thread already checking. Lets not block and then potentially wait for a timeout.
- Boolean connected = openOfficeConnectionTester.testAndConnectNoQueuing();
- if (connected != null)
- {
- // Now log, if necessary
- if (OpenOfficeConnectionTesterJob.wasConnected == null)
- {
- // This is the first pass
- }
- else if (OpenOfficeConnectionTesterJob.wasConnected.booleanValue() == connected)
- {
- // Nothing changed since last time
- }
- else
- {
- if (connected)
- {
- // This is reported as a warning as admins must be aware that it is bouncing
- logger.info(I18NUtil.getMessage(ERR_CONNECTION_REMADE));
- }
- else
- {
- logger.error(I18NUtil.getMessage(ERR_CONNECTION_LOST));
- }
- // The value changed so ensure that the registries are bounced
- if (metadataExtracterRegistry != null)
- {
- metadataExtracterRegistry.resetCache();
- }
- }
- // Record the state
- OpenOfficeConnectionTesterJob.wasConnected = Boolean.valueOf(connected);
- }
- }
- }
-}
diff --git a/src/main/java/org/alfresco/util/SocketOpenOfficeConnection.java b/src/main/java/org/alfresco/util/SocketOpenOfficeConnection.java
deleted file mode 100644
index 65632d93ca..0000000000
--- a/src/main/java/org/alfresco/util/SocketOpenOfficeConnection.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-package org.alfresco.util;
-
-import org.alfresco.util.bean.BooleanBean;
-
-import net.sf.jooreports.openoffice.converter.AbstractOpenOfficeDocumentConverter;
-import net.sf.jooreports.openoffice.converter.OpenOfficeDocumentConverter;
-import net.sf.jooreports.openoffice.converter.StreamOpenOfficeDocumentConverter;
-
-public class SocketOpenOfficeConnection extends net.sf.jooreports.openoffice.connection.SocketOpenOfficeConnection
-{
- private boolean defaultHost = true;
- private boolean enabled = true;
-
- public SocketOpenOfficeConnection() {
- super();
- }
-
- public SocketOpenOfficeConnection(int port) {
- super(port);
- }
-
- public SocketOpenOfficeConnection(String host, int port) {
- super(host, port);
- defaultHost = DEFAULT_HOST.equals(host);
- }
-
- public AbstractOpenOfficeDocumentConverter getDefaultConverter()
- {
- return defaultHost
- ? new OpenOfficeDocumentConverter(this)
- : new StreamOpenOfficeDocumentConverter(this);
- }
-
- public void setEnabledFromBean(BooleanBean enabled)
- {
- this.enabled = enabled.isTrue();
- }
-
- public boolean isConnected() {
- return enabled && super.isConnected();
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-}
diff --git a/src/main/resources/alfresco-global.properties.sample b/src/main/resources/alfresco-global.properties.sample
index 3d81052a02..ff33a4b15c 100644
--- a/src/main/resources/alfresco-global.properties.sample
+++ b/src/main/resources/alfresco-global.properties.sample
@@ -17,9 +17,7 @@
#
# External locations
#-------------
-#ooo.exe=soffice
-#ooo.enabled=false
-#jodconverter.officeHome=./OpenOffice.org
+#jodconverter.officeHome=/usr/lib64/libreoffice
#jodconverter.portNumbers=8101
#jodconverter.enabled=true
#img.root=./ImageMagick
diff --git a/src/main/resources/alfresco/bootstrap-context.xml b/src/main/resources/alfresco/bootstrap-context.xml
index 3fae856eb3..cc299c246b 100644
--- a/src/main/resources/alfresco/bootstrap-context.xml
+++ b/src/main/resources/alfresco/bootstrap-context.xml
@@ -311,16 +311,26 @@
-
+
+
true
+
+
+
+
+
+
+
+
-
-
+
diff --git a/src/main/resources/alfresco/content-services-context.xml b/src/main/resources/alfresco/content-services-context.xml
index 3940363b1e..400c8b5b49 100644
--- a/src/main/resources/alfresco/content-services-context.xml
+++ b/src/main/resources/alfresco/content-services-context.xml
@@ -275,44 +275,6 @@
-
-
-
- OOoJodconverter
-
-
- jodConfig
-
-
-
- org.alfresco.util.JodConfig
-
-
-
-
-
- false
-
-
-
-
-
-
-
-
@@ -378,11 +340,6 @@
-
@@ -606,13 +563,39 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -621,9 +604,11 @@
-
+
-
-
-
-
-
- application/pdf
-
-
-
-
-
-
@@ -88,11 +86,11 @@
-
-
+
+
-
diff --git a/src/main/resources/alfresco/metadata/OpenOfficeMetadataExtracter.properties b/src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties
similarity index 64%
rename from src/main/resources/alfresco/metadata/OpenOfficeMetadataExtracter.properties
rename to src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties
index dc8e947e21..fd4bc33317 100644
--- a/src/main/resources/alfresco/metadata/OpenOfficeMetadataExtracter.properties
+++ b/src/main/resources/alfresco/metadata/JodConverterMetadataExtracter.properties
@@ -1,12 +1,12 @@
-#
-# OpenOfficeMetadataExtracter - default mapping
-#
-# author: Derek Hulley
-
-# Namespaces
-namespace.prefix.cm=http://www.alfresco.org/model/content/1.0
-
-# Mappings
-author=cm:author
-title=cm:title
-description=cm:description
+#
+# JodConverterMetadataExtracter - default mapping
+#
+# author: Neil McErlean
+
+# Namespaces
+namespace.prefix.cm=http://www.alfresco.org/model/content/1.0
+
+# Mappings
+author=cm:author
+title=cm:title
+description=cm:description
diff --git a/src/main/resources/alfresco/mimetype/jodconverter-document-formats.json b/src/main/resources/alfresco/mimetype/jodconverter-document-formats.json
new file mode 100644
index 0000000000..8af372aa19
--- /dev/null
+++ b/src/main/resources/alfresco/mimetype/jodconverter-document-formats.json
@@ -0,0 +1,339 @@
+[
+ {
+ "name": "Portable Document Format",
+ "extension": "pdf",
+ "mediaType": "application/pdf",
+ "storePropertiesByFamily": {
+ "DRAWING": {"FilterName": "draw_pdf_Export"},
+ "SPREADSHEET": {"FilterName": "calc_pdf_Export"},
+ "PRESENTATION": {"FilterName": "impress_pdf_Export"},
+ "TEXT": {"FilterName": "writer_pdf_Export"}
+ }
+ },
+ {
+ "name": "Macromedia Flash",
+ "extension": "swf",
+ "mediaType": "application/x-shockwave-flash",
+ "storePropertiesByFamily": {
+ "DRAWING": {"FilterName": "draw_flash_Export"},
+ "PRESENTATION": {"FilterName": "impress_flash_Export"}
+ }
+ },
+ {
+ "name": "HTML",
+ "extension": "html",
+ "mediaType": "text/html",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {
+ "SPREADSHEET": {"FilterName": "HTML (StarCalc)"},
+ "PRESENTATION": {"FilterName": "impress_html_Export"},
+ "TEXT": {"FilterName": "HTML (StarWriter)"}
+ }
+ },
+ {
+ "name": "OpenDocument Text",
+ "extension": "odt",
+ "mediaType": "application/vnd.oasis.opendocument.text",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "writer8"}}
+ },
+ {
+ "name": "OpenDocument Text Template",
+ "extension": "ott",
+ "mediaType": "application/vnd.oasis.opendocument.text-template",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "writer8"}}
+ },
+ {
+ "name": "OpenOffice.org 1.0 Text Document",
+ "extension": "sxw",
+ "mediaType": "application/vnd.sun.xml.writer",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "StarOffice XML (Writer)"}}
+ },
+ {
+ "name": "OpenOffice.org 1.0 Text Document Template",
+ "extension": "stw",
+ "mediaType": "application/vnd.sun.xml.writer.template",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "StarOffice XML (Writer)"}}
+ },
+ {
+ "name": "Microsoft Word",
+ "extension": "doc",
+ "mediaType": "application/msword",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "MS Word 97"}}
+ },
+ {
+ "name": "Microsoft Word 2007 XML",
+ "extension": "docx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "MS Word 2007"}}
+ },
+ {
+ "name": "Microsoft Word 2007 macro-enabled document",
+ "extension": "docm",
+ "mediaType": "application/vnd.ms-word.document.macroEnabled.12",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "MS Word 2007"}}
+ },
+ {
+ "name": "Microsoft Word template 2007",
+ "extension": "dotx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.wordprocessingml.template",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "MS Word 2007"}}
+ },
+ {
+ "name": "Microsoft Word 2007 macro-enabled document template",
+ "extension": "dotm",
+ "mediaType": "application/vnd.ms-word.template.macroEnabled.12",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "MS Word 2007"}}
+ },
+ {
+ "name": "WordPerfect",
+ "extension": "wpd",
+ "mediaType": "application/wordperfect",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "WordPerfect"}}
+ },
+ {
+ "name": "Rich Text Format",
+ "extension": "rtf",
+ "mediaType": "text/rtf",
+ "inputFamily": "TEXT",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "Rich Text Format"}}
+ },
+ {
+ "name": "Plain Text",
+ "extension": "txt",
+ "mediaType": "text/plain",
+ "inputFamily": "TEXT",
+ "loadProperties": {
+ "FilterName": "Text (encoded)",
+ "FilterOptions": "utf8"
+ },
+ "storePropertiesByFamily": {"TEXT": {
+ "FilterName": "Text (encoded)",
+ "FilterOptions": "utf8"
+ }}
+ },
+ {
+ "name": "MediaWiki wikitext",
+ "extension": "wiki",
+ "mediaType": "text/x-wiki",
+ "storePropertiesByFamily": {"TEXT": {"FilterName": "MediaWiki"}}
+ },
+ {
+ "name": "OpenDocument Spreadsheet",
+ "extension": "ods",
+ "mediaType": "application/vnd.oasis.opendocument.spreadsheet",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "calc8"}}
+ },
+ {
+ "name": "OpenDocument Spreadsheet Template",
+ "extension": "ots",
+ "mediaType": "application/vnd.oasis.opendocument.spreadsheet-template",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "calc8"}}
+ },
+ {
+ "name": "OpenOffice.org 1.0 Spreadsheet",
+ "extension": "sxc",
+ "mediaType": "application/vnd.sun.xml.calc",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "StarOffice XML (Calc)"}}
+ },
+ {
+ "name": "OpenOffice.org 1.0 Spreadsheet Template",
+ "extension": "stc",
+ "mediaType": "application/vnd.sun.xml.calc.template",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "StarOffice XML (Calc)"}}
+ },
+ {
+ "name": "Microsoft Excel",
+ "extension": "xls",
+ "mediaType": "application/vnd.ms-excel",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 97"}}
+ },
+ {
+ "name": "Microsoft Excel 2007 XML",
+ "extension": "xlsx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 2007"}}
+ },
+ {
+ "name": "Microsoft Excel template 2007",
+ "extension": "xltx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 2007"}}
+ },
+ {
+ "name": "Microsoft Excel 2007 macro-enabled workbook",
+ "extension": "xlsm",
+ "mediaType": "application/vnd.ms-excel.sheet.macroEnabled.12",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 2007"}}
+ },
+ {
+ "name": "Microsoft Excel 2007 macro-enabled workbook template",
+ "extension": "application/vnd.ms-excel.template.macroEnabled.12",
+ "mediaType": "xltm",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 2007"}}
+ },
+ {
+ "name": "Microsoft Excel 2007 binary workbook",
+ "extension": "xlsb",
+ "mediaType": "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
+ "inputFamily": "SPREADSHEET",
+ "storePropertiesByFamily": {"SPREADSHEET": {"FilterName": "MS Excel 2007"}}
+ },
+ {
+ "name": "Comma Separated Values",
+ "extension": "csv",
+ "mediaType": "text/csv",
+ "inputFamily": "SPREADSHEET",
+ "loadProperties": {
+ "FilterName": "Text - txt - csv (StarCalc)",
+ "FilterOptions": "44,34,0"
+ },
+ "storePropertiesByFamily": {"SPREADSHEET": {
+ "FilterName": "Text - txt - csv (StarCalc)",
+ "FilterOptions": "44,34,0"
+ }}
+ },
+ {
+ "name": "Tab Separated Values",
+ "extension": "tsv",
+ "mediaType": "text/tab-separated-values",
+ "inputFamily": "SPREADSHEET",
+ "loadProperties": {
+ "FilterName": "Text - txt - csv (StarCalc)",
+ "FilterOptions": "9,34,0"
+ },
+ "storePropertiesByFamily": {"SPREADSHEET": {
+ "FilterName": "Text - txt - csv (StarCalc)",
+ "FilterOptions": "9,34,0"
+ }}
+ },
+ {
+ "name": "OpenDocument Presentation",
+ "extension": "odp",
+ "mediaType": "application/vnd.oasis.opendocument.presentation",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "impress8"}}
+ },
+ {
+ "name": "OpenDocument Presentation Template",
+ "extension": "otp",
+ "mediaType": "application/vnd.oasis.opendocument.presentation-template",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "impress8"}}
+ },
+ {
+ "name": "OpenOffice.org 1.0 Presentation",
+ "extension": "sxi",
+ "mediaType": "application/vnd.sun.xml.impress",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "StarOffice XML (Impress)"}}
+ },
+ {
+ "name": "OpenOffice.org 1.0 Presentation Template",
+ "extension": "sti",
+ "mediaType": "application/vnd.sun.xml.impress.template",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "StarOffice XML (Impress)"}}
+ },
+ {
+ "name": "Microsoft PowerPoint",
+ "extension": "ppt",
+ "mediaType": "application/vnd.ms-powerpoint",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 97"}}
+ },
+ {
+ "name": "Microsoft PowerPoint 2007 XML",
+ "extension": "pptx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft owerPoint 2007 macro-enabled presentation",
+ "extension": "pptm",
+ "mediaType": "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft PowerPoint 2007 template",
+ "extension": "potx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.presentationml.template",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft PowerPoint 2007 macro-enabled presentation template",
+ "extension": "potm",
+ "mediaType": "application/vnd.ms-powerpoint.template.macroEnabled.12",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft PowerPoint 2007 add-in",
+ "extension": "ppam",
+ "mediaType": "application/vnd.ms-powerpoint.addin.macroEnabled.12",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft PowerPoint 2007 slide",
+ "extension": "sldx",
+ "mediaType": "application/vnd.openxmlformats-officedocument.presentationml.slide",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft PowerPoint 2007 macro-enabled slide",
+ "extension": "sldm",
+ "mediaType": "application/vnd.ms-powerpoint.slideshow.macroEnabled.12",
+ "inputFamily": "PRESENTATION",
+ "storePropertiesByFamily": {"PRESENTATION": {"FilterName": "MS PowerPoint 2007"}}
+ },
+ {
+ "name": "Microsoft Visio",
+ "extension": "vsd",
+ "mediaType": "application/vnd.visio",
+ "inputFamily": "DRAWING",
+ "storePropertiesByFamily": {"DRAWING": {"FilterName": "MS Visio"}}
+ },
+ {
+ "name": "Microsoft Visio 2013",
+ "extension": "vsdx",
+ "mediaType": "application/vnd.visio2013",
+ "inputFamily": "DRAWING",
+ "storePropertiesByFamily": {"DRAWING": {"FilterName": "MS Visio 2013"}}
+ },
+ {
+ "name": "OpenDocument Drawing",
+ "extension": "odg",
+ "mediaType": "application/vnd.oasis.opendocument.graphics",
+ "inputFamily": "DRAWING",
+ "storePropertiesByFamily": {"DRAWING": {"FilterName": "draw8"}}
+ },
+ {
+ "name": "Scalable Vector Graphics",
+ "extension": "svg",
+ "mediaType": "image/svg+xml",
+ "storePropertiesByFamily": {"DRAWING": {"FilterName": "draw_svg_Export"}}
+ }
+]
diff --git a/src/main/resources/alfresco/mimetype/openoffice-document-formats.xml b/src/main/resources/alfresco/mimetype/openoffice-document-formats.xml
deleted file mode 100644
index fa2494df45..0000000000
--- a/src/main/resources/alfresco/mimetype/openoffice-document-formats.xml
+++ /dev/null
@@ -1,426 +0,0 @@
-
-
-
-
-
- Portable Document Format
- application/pdf
- pdf
-
- Presentationimpress_pdf_Export
- Spreadsheetcalc_pdf_Export
- Textwriter_pdf_Export
-
-
-
- Macromedia Flash
- application/x-shockwave-flash
- swf
-
- Presentationimpress_flash_Export
-
-
-
-
- Html
- Text
- text/html
- html
-
- Presentationimpress_html_Export
- SpreadsheetHTML (StarCalc)
- TextHTML (StarWriter)
-
-
-
-
-
- OpenDocument Text
- Text
- application/vnd.oasis.opendocument.text
- odt
-
- Textwriter8
-
-
-
- OpenDocument Text Template
- Text
- application/vnd.oasis.opendocument.text-template
- ott
-
- Textwriter8
-
-
-
- OpenOffice.org 1.0 Text Document
- Text
- application/vnd.sun.xml.writer
- sxw
-
- TextStarOffice XML (Writer)
-
-
-
- OpenOffice.org 1.0 Text Document Template
- Text
- application/vnd.sun.xml.writer.template
- stw
-
- TextStarOffice XML (Writer)
-
-
-
- Microsoft Word
- Text
- application/msword
- doc
-
- TextMS Word 97
-
-
-
- Microsoft Word 2007
- Text
- application/vnd.openxmlformats-officedocument.wordprocessingml.document
- docx
-
- TextMS Word 2007
-
-
-
- Microsoft Word 2007 macro-enabled document
- Text
- application/vnd.ms-word.document.macroEnabled.12
- docm
-
- TextMS Word 2007
-
-
-
- Microsoft Word template 2007
- Text
- application/vnd.openxmlformats-officedocument.wordprocessingml.template
- dotx
-
- TextMS Word 2007
-
-
-
- Microsoft Word 2007 macro-enabled document template
- Text
- application/vnd.ms-word.template.macroEnabled.12
- dotm
-
- TextMS Word 2007
-
-
-
- WordPerfect
- Text
- application/wordperfect
- wpd
-
- TextWordPerfect
-
-
-
- Rich Text Format
- Text
- text/rtf
- rtf
-
- TextRich Text Format
-
-
-
- Plain Text
- Text
- text/plain
- txt
-
- TextText
-
-
-
-
-
- OpenDocument Spreadsheet
- Spreadsheet
- application/vnd.oasis.opendocument.spreadsheet
- ods
-
- Spreadsheetcalc8
-
-
-
- OpenDocument Spreadsheet Template
- Spreadsheet
- application/vnd.oasis.opendocument.spreadsheet-template
- ots
-
- Spreadsheetcalc8
-
-
-
- OpenOffice.org 1.0 Spreadsheet
- Spreadsheet
- application/vnd.sun.xml.calc
- sxc
-
- SpreadsheetStarOffice XML (Calc)
-
-
-
- OpenOffice.org 1.0 Spreadsheet Template
- Spreadsheet
- application/vnd.sun.xml.calc.template
- stc
-
- SpreadsheetStarOffice XML (Calc)
-
-
-
-
- Microsoft Excel
- Spreadsheet
- application/vnd.ms-excel
- xls
-
- SpreadsheetMS Excel 97
-
-
-
- Microsoft Excel 2007
- Spreadsheet
- application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
- xlsx
-
- SpreadsheetMS Excel 2007
-
-
-
- Microsoft Excel template 2007
- Spreadsheet
- application/vnd.openxmlformats-officedocument.spreadsheetml.template
- xltx
-
- SpreadsheetMS Excel 2007
-
-
-
- Microsoft Excel 2007 macro-enabled workbook
- Spreadsheet
- application/vnd.ms-excel.sheet.macroEnabled.12
- xlsm
-
- SpreadsheetMS Excel 2007
-
-
-
- Microsoft Excel 2007 macro-enabled workbook template
- Spreadsheet
- application/vnd.ms-excel.template.macroEnabled.12
- xltm
-
- SpreadsheetMS Excel 2007
-
-
-
-
-
- Microsoft Excel 2007 binary workbook
- Spreadsheet
- application/vnd.ms-excel.sheet.binary.macroEnabled.12
- xlsb
-
- SpreadsheetMS Excel 2007
-
-
-
-
-
-
-
-
-
- OpenDocument Presentation
- Presentation
- application/vnd.oasis.opendocument.presentation
- odp
-
- Presentationimpress8
-
-
-
- OpenDocument Presentation Template
- Presentation
- application/vnd.oasis.opendocument.presentation-template
- otp
-
- Presentationimpress8
-
-
-
- OpenOffice.org 1.0 Presentation
- Presentation
- application/vnd.sun.xml.impress
- sxi
-
- PresentationStarOffice XML (Impress)
-
-
-
- OpenOffice.org 1.0 Presentation Template
- Presentation
- application/vnd.sun.xml.impress.template
- sti
-
- PresentationStarOffice XML (Impress)
-
-
-
- Microsoft PowerPoint
- Presentation
- application/vnd.ms-powerpoint
- ppt
-
- PresentationMS PowerPoint 97
-
-
-
- Microsoft PowerPoint 2007 presentation
- Presentation
- application/vnd.openxmlformats-officedocument.presentationml.presentation
- pptx
-
- PresentationMS PowerPoint 2007
-
-
-
- Microsoft owerPoint 2007 macro-enabled presentation
- Presentation
- application/vnd.ms-powerpoint.presentation.macroEnabled.12
- pptm
-
- PresentationMS PowerPoint 2007
-
-
-
-
-
-
-
- Microsoft PowerPoint 2007 template
- Presentation
- application/vnd.openxmlformats-officedocument.presentationml.template
- potx
-
- PresentationMS PowerPoint 2007
-
-
-
- Microsoft PowerPoint 2007 macro-enabled presentation template
- Presentation
- application/vnd.ms-powerpoint.template.macroEnabled.12
- potm
-
- PresentationMS PowerPoint 2007
-
-
-
- Microsoft PowerPoint 2007 add-in
- Presentation
- application/vnd.ms-powerpoint.addin.macroEnabled.12
- ppam
-
- PresentationMS PowerPoint 2007
-
-
-
- Microsoft PowerPoint 2007 slide
- Presentation
- application/vnd.openxmlformats-officedocument.presentationml.slide
- sldx
-
- PresentationMS PowerPoint 2007
-
-
-
- Microsoft PowerPoint 2007 macro-enabled slide
- Presentation
- application/vnd.ms-powerpoint.slideshow.macroEnabled.12
- sldm
-
- PresentationMS PowerPoint 2007
-
-
-
- Microsoft Visio
- Presentation
- application/vnd.visio
- vsd
-
- PresentationMS Visio
-
-
-
- Microsoft Visio 2013
- Presentation
- application/vnd.visio2013
- vsdx
-
- PresentationMS Visio
-
-
-
- OpenDocument Drawing
- Presentation
- application/vnd.oasis.opendocument.graphics
- odg
-
- Presentationdraw8
-
-
-
-
diff --git a/src/main/resources/alfresco/repository.properties b/src/main/resources/alfresco/repository.properties
index 15ddc2cb57..9d0a0f279e 100644
--- a/src/main/resources/alfresco/repository.properties
+++ b/src/main/resources/alfresco/repository.properties
@@ -161,9 +161,6 @@ shutdown.backstop.enabled=false
# 0 prevents further logins, including the ability to enter single-user mode
server.maxusers=-1
-# The Cron expression controlling the frequency with which the OpenOffice connection is tested
-openOffice.test.cronExpression=0 * * * * ?
-
#
# Disable all shared caches (mutable and immutable)
# These properties are used for diagnostic purposes
@@ -592,8 +589,6 @@ monitor.rmi.service.enabled=false
mbean.server.locateExistingServerIfPossible=true
# External executable locations
-ooo.exe=soffice
-ooo.user=${dir.root}/oouser
img.root=./ImageMagick
img.dyn=${img.root}/lib
img.exe=${img.root}/bin/convert
diff --git a/src/main/resources/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml b/src/main/resources/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
deleted file mode 100644
index d9a2c5db9a..0000000000
--- a/src/main/resources/alfresco/subsystems/OOoDirect/default/openoffice-transform-context.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- false
-
-
-
-
- true if OpenOffice-based transformations are currently known to
+ * be available, else false.
+ */
+ protected boolean isOpenOfficeAvailable()
+ {
+ ContentTransformer transformer = contentService.getTransformer(null, MimetypeMap.MIMETYPE_WORD, -1, MimetypeMap.MIMETYPE_PDF, new TransformationOptions());
+
+ // A transformer may not be returned here if it is unavailable.
+ if (transformer == null)
+ {
+ return false;
+ }
+
+ // Maybe it's non-null, but not available.
+ boolean isTransformable = transformer.isTransformable(MimetypeMap.MIMETYPE_WORD, -1, MimetypeMap.MIMETYPE_PDF, null);
+ return isTransformable;
+ }
+
+ @Before
+ public void createTemporaryNodeRefs() throws Exception
+ {
+ // Create a content node which will serve as test data for our transformations.
+ RetryingTransactionCallback makeNodeCallback = new RetryingTransactionCallback()
+ {
+ public NodeRef execute() throws Throwable
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Creating temporary NodeRefs for testing.");
+ }
+
+ final NodeRef companyHome = repositoryHelper.getCompanyHome();
+ // Create a folder
+ Map folderProps = new HashMap();
+ folderProps.put(ContentModel.PROP_NAME, this.getClass().getSimpleName() + System.currentTimeMillis());
+
+ NodeRef folderNodeRef = nodeService.createNode(companyHome, ContentModel.ASSOC_CONTAINS,
+ ContentModel.ASSOC_CONTAINS, ContentModel.TYPE_FOLDER, folderProps).getChildRef();
+ nodesToDeleteAfterTest.add(folderNodeRef);
+
+ // Add some content.
+ File origFile = AbstractContentTransformerTest.loadQuickTestFile("doc");
+
+ Map props = new HashMap();
+ props.put(ContentModel.PROP_NAME, "original." + "doc");
+ NodeRef node = nodeService.createNode(
+ folderNodeRef,
+ ContentModel.ASSOC_CONTAINS,
+ QName.createQName(NamespaceService.CONTENT_MODEL_1_0_URI, "original.doc"),
+ ContentModel.TYPE_CONTENT,
+ props).getChildRef();
+
+ ContentWriter writer = contentService.getWriter(node, ContentModel.PROP_CONTENT, true);
+ writer.setMimetype(MimetypeMap.MIMETYPE_WORD);
+ writer.setEncoding("UTF-8");
+ writer.putContent(origFile);
+
+ return node;
+ }
+ };
+ contentNodeRef = transactionService.getRetryingTransactionHelper().doInTransaction(makeNodeCallback);
+ this.nodesToDeleteAfterTest.add(contentNodeRef);
+ }
+
+ @After
+ public void deleteTemporaryNodeRefs()
+ {
+ // Tidy up the test nodes we created
+ RetryingTransactionCallback deleteNodeCallback = new RetryingTransactionCallback()
+ {
+ public Void execute() throws Throwable
+ {
+ // Delete them in reverse order.
+ for (Iterator iter = nodesToDeleteAfterTest.descendingIterator(); iter.hasNext(); )
+ {
+ NodeRef nextNodeToDelete = iter.next();
+
+ if (nodeService.exists(nextNodeToDelete))
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Deleting temporary node " + nextNodeToDelete);
+ }
+ nodeService.deleteNode(nextNodeToDelete);
+ }
+ }
+
+ return null;
+ }
+ };
+ transactionService.getRetryingTransactionHelper().doInTransaction(deleteNodeCallback);
+ }
+
+ @AfterClass
+ public static void stopOOoSubsystems() throws Exception
+ {
+ // Put the OOoJodconverter subsystem back to its install settings (disabled).
+ if (log.isDebugEnabled())
+ {
+ log.debug("Disabling OOoJodconverter");
+ }
+ oooJodcSubsystem.stop();
+ oooJodcSubsystem.setProperty("jodconverter.enabled", "false");
+ oooJodcSubsystem.start();
+
+ oooJodcSubsystem.stop();
+ }
+}
diff --git a/src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java b/src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java
new file mode 100644
index 0000000000..f4d7f46bdf
--- /dev/null
+++ b/src/test/java/org/alfresco/repo/content/JodConverterSharedInstanceTest.java
@@ -0,0 +1,244 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.content;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.MockitoAnnotations;
+
+import java.io.File;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Tests methods added to JodConverterSharedInstance that try to use the replaced oooDirect settings.
+ * @author Alan Davis
+ */
+public class JodConverterSharedInstanceTest
+{
+ public static final String LIBREOFFICE = "libreoffice";
+ public static final String PROGRAM = "program";
+ public static final String ELSEWHERE = "elsewhere";
+ public static final String SOFFICE_BIN = "soffice.bin";
+ public static final String SOFFICE_EXE = "soffice.exe";
+
+ private static final File OFFICE_HOME_DIR = new File(LIBREOFFICE);
+ private static final File PROGRAM_DIR = new File(OFFICE_HOME_DIR, PROGRAM);
+ private static final File ELSEWHERE_DIR = new File(OFFICE_HOME_DIR, ELSEWHERE);
+
+ private static final String OFFICE_HOME = OFFICE_HOME_DIR.getPath();
+ private static final String PROGRAM_BIN = new File( PROGRAM_DIR, SOFFICE_BIN).getPath();
+ private static final String PROGRAM_EXE = new File( PROGRAM_DIR, SOFFICE_EXE).getPath();
+ private static final String ELSEWHERE_BIN = new File( ELSEWHERE_DIR, SOFFICE_BIN).getPath();
+ private static final String NO_OFFICE_HOME_BIN = new File(new File(PROGRAM), SOFFICE_BIN).getPath();
+ private static final String JUST_SOFFICE_BIN = new File( SOFFICE_BIN).getPath();
+
+
+ private JodConverterSharedInstance instance;
+
+ @Before
+ public void setUp() throws Exception
+ {
+ MockitoAnnotations.initMocks(this);
+ instance = new JodConverterSharedInstance();
+ }
+
+ @Test
+ public void setupTest()
+ {
+ String SLASH = File.separator;
+ assertEquals(LIBREOFFICE, OFFICE_HOME);
+ assertEquals(LIBREOFFICE + SLASH + PROGRAM + SLASH + SOFFICE_EXE, PROGRAM_EXE);
+ assertEquals(LIBREOFFICE + SLASH + PROGRAM + SLASH + SOFFICE_BIN, PROGRAM_BIN);
+ assertEquals(LIBREOFFICE + SLASH + ELSEWHERE + SLASH + SOFFICE_BIN, ELSEWHERE_BIN);
+ assertEquals( PROGRAM + SLASH + SOFFICE_BIN, NO_OFFICE_HOME_BIN);
+ assertEquals( SOFFICE_BIN, JUST_SOFFICE_BIN);
+ assertNotEquals(PROGRAM_BIN, PROGRAM_EXE);
+ }
+
+ @Test
+ public void officeHomeTest()
+ {
+ // Only jodconverter.officehome
+ instance.setOfficeHome(OFFICE_HOME);
+ instance.setDeprecatedOooExe(null);
+ assertEquals(OFFICE_HOME, instance.getOfficeHome());
+
+ // Use ooo.exe
+ instance.setOfficeHome(null);
+ instance.setDeprecatedOooExe(PROGRAM_BIN);
+ assertEquals(OFFICE_HOME, instance.getOfficeHome());
+
+ // jodconverter.officehome wins
+ instance.setOfficeHome(OFFICE_HOME);
+ instance.setDeprecatedOooExe(PROGRAM_EXE);
+ assertEquals(OFFICE_HOME, instance.getOfficeHome());
+
+ // ooo.exe has no parent
+ instance.setOfficeHome(null);
+ instance.setDeprecatedOooExe(JUST_SOFFICE_BIN);
+ assertEquals("", instance.getOfficeHome());
+
+ // ooo.exe parent is not "program"
+ instance.setOfficeHome(null);
+ instance.setDeprecatedOooExe(ELSEWHERE_BIN);
+ assertEquals("", instance.getOfficeHome());
+
+ // ooo.exe has a parent "program" directory but no grandparent
+ instance.setOfficeHome(null);
+ instance.setDeprecatedOooExe(NO_OFFICE_HOME_BIN);
+ assertEquals("", instance.getOfficeHome());
+ }
+
+ @Test
+ public void enabledTest()
+ {
+ // If ooo.enabled is true the JodConverter will be enabled, otherwise the jodconverter.enabled value is used.
+ // Community set properties via alfresco-global.properties.
+ // Enterprise may do the same but may also reset jodconverter.enabled them via the Admin console.
+ // In the case of Enterprise it is very unlikely that ooo.enabled will be set to true.
+
+ // Only jodconverter.enabled
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("true");
+ instance.setDeprecatedOooEnabled(null);
+ assertTrue(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("true");
+ assertTrue(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("false");
+ instance.setDeprecatedOooEnabled(null);
+ assertFalse(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("false");
+ assertFalse(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("any value other than true");
+ instance.setDeprecatedOooEnabled(null);
+ assertFalse(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("");
+ instance.setDeprecatedOooEnabled(null);
+ assertFalse(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled(null);
+ instance.setDeprecatedOooEnabled(null);
+ assertFalse(instance.isEnabled());
+
+ // Use ooo.enabled
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled(null);
+ instance.setDeprecatedOooEnabled("true");
+ assertTrue(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled(null);
+ instance.setDeprecatedOooEnabled("false");
+ assertFalse(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setDeprecatedOooEnabled("true");
+ assertTrue(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setDeprecatedOooEnabled("false");
+ assertFalse(instance.isEnabled());
+
+ // Check jodconverter.enabled is used if ooo.enabled is false - Original Enterprise setup
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("true");
+ instance.setDeprecatedOooEnabled("false");
+ assertTrue(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("false");
+ instance.setDeprecatedOooEnabled("false");
+ assertFalse(instance.isEnabled());
+
+ // Check jodconverter.enabled is ignored if ooo.enabled is true - Original Community setup
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("true");
+ instance.setDeprecatedOooEnabled("true");
+ assertTrue(instance.isEnabled());
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("false");
+ instance.setDeprecatedOooEnabled("true");
+ assertTrue(instance.isEnabled());
+
+ // Check reset of jodconverter.enabled turns off isAvailable
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("true");
+ instance.isAvailable = true; // Normally set to true after running afterPropertiesSet()
+ instance.setEnabled("true");
+ assertTrue(instance.isAvailable);
+ instance.setEnabled("false");
+ assertFalse(instance.isAvailable);
+
+ instance = new JodConverterSharedInstance();
+ instance.setEnabled("true");
+ instance.setDeprecatedOooEnabled("false"); // Extra line compare with previous
+ instance.isAvailable = true;
+ instance.setEnabled("true");
+ assertTrue(instance.isAvailable);
+ instance.setEnabled("false");
+ assertFalse(instance.isAvailable);
+ }
+
+ @Test
+ public void portNumbersTest()
+ {
+ // ooo.port or jodconverter.portNumber is used depending on the setting of enabled properties.
+ // If jodconverter.enabled is true jodconverter.portNumber is used.
+ // If jodconverter.enabled is false and ooo.enabled is true ooo.port is used.
+ // If jodconverter.enabled is false and ooo.enabled is true ooo.port is used.
+
+ // jodconverter.enabled=true use jodconverter.portNumber
+ instance.setEnabled("true");
+ instance.setPortNumbers("8001,8002,8003");
+ instance.setDeprecatedOooPort("8001");
+ assertArrayEquals(new int[] {8001, 8002, 8003}, instance.getPortNumbers());
+
+ // jodconverter.enabled=true and ooo.enabled=true use jodconverter.portNumber
+ instance.setDeprecatedOooEnabled("true");
+ assertArrayEquals(new int[] {8001, 8002, 8003}, instance.getPortNumbers());
+
+ // jodconverter.enabled=false and ooo.enabled=true use ooo.port
+ instance.setEnabled("false");
+ assertArrayEquals(new int[] {8001}, instance.getPortNumbers());
+ }
+}
diff --git a/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java b/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java
index f4797ad47f..d034869d21 100644
--- a/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java
+++ b/src/test/java/org/alfresco/repo/content/metadata/AbstractMetadataExtracterTest.java
@@ -72,8 +72,7 @@ import org.springframework.context.ApplicationContext;
/**
* @see org.alfresco.repo.content.metadata.MetadataExtracter
- * @see org.alfresco.repo.content.metadata.AbstractMetadataExtracter
- *
+ *
* @author Jesper Steen Møller
*/
public abstract class AbstractMetadataExtracterTest extends TestCase
diff --git a/src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java b/src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java
new file mode 100644
index 0000000000..328598de1e
--- /dev/null
+++ b/src/test/java/org/alfresco/repo/content/metadata/JodMetadataExtractorOOoTest.java
@@ -0,0 +1,140 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.content.metadata;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.alfresco.repo.content.AbstractJodConverterBasedTest;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.content.MimetypeMap;
+import org.alfresco.repo.content.filestore.FileContentReader;
+import org.alfresco.repo.content.metadata.OpenOfficeMetadataWorker;
+import org.alfresco.repo.content.transform.AbstractContentTransformerTest;
+import org.alfresco.service.cmr.repository.ContentReader;
+import org.alfresco.service.cmr.repository.datatype.DefaultTypeConverter;
+import org.alfresco.service.namespace.QName;
+import org.junit.Test;
+
+/**
+ *
+ * @author Neil McErlean
+ * @since 3.2 SP1
+ */
+public class JodMetadataExtractorOOoTest extends AbstractJodConverterBasedTest
+{
+ protected static final String QUICK_TITLE = "The quick brown fox jumps over the lazy dog";
+ protected static final String QUICK_DESCRIPTION = "Gym class featuring a brown fox and lazy dog";
+ protected static final String QUICK_CREATOR = "Nevin Nollop";
+ protected static final String QUICK_CREATOR_EMAIL = "nevin.nollop@alfresco.com";
+ protected static final String QUICK_PREVIOUS_AUTHOR = "Derek Hulley";
+
+ @Test
+ public void metadataExtractionUsingJodConverter() throws Exception
+ {
+ // If OpenOffice is not available then we will ignore this test (by passing it).
+ // This is because not all the build servers have OOo installed.
+ if (!isOpenOfficeAvailable())
+ {
+ System.out.println("Did not run " + this.getClass().getSimpleName() + "thumbnailTransformationsUsingJodConverter" +
+ " because OOo is not available.");
+ return;
+ }
+
+ Map properties = extractFromMimetype();
+ assertFalse("extractFromMimetype should return at least some properties, none found", properties.isEmpty());
+ String mimetype = MimetypeMap.MIMETYPE_WORD;
+
+ // One of Creator or Author
+ if (properties.containsKey(ContentModel.PROP_CREATOR))
+ {
+ assertEquals("Property " + ContentModel.PROP_CREATOR
+ + " not found for mimetype " + mimetype, QUICK_CREATOR,
+ DefaultTypeConverter.INSTANCE.convert(String.class,
+ properties.get(ContentModel.PROP_CREATOR)));
+ } else if (properties.containsKey(ContentModel.PROP_AUTHOR))
+ {
+ assertEquals("Property " + ContentModel.PROP_AUTHOR
+ + " not found for mimetype " + mimetype, QUICK_CREATOR,
+ DefaultTypeConverter.INSTANCE.convert(String.class,
+ properties.get(ContentModel.PROP_AUTHOR)));
+ } else
+ {
+ fail("Expected one Property out of " + ContentModel.PROP_CREATOR
+ + " and " + ContentModel.PROP_AUTHOR
+ + " but found neither of them.");
+ }
+
+ // Title and description
+ assertEquals("Property " + ContentModel.PROP_TITLE
+ + " not found for mimetype " + mimetype, QUICK_TITLE,
+ DefaultTypeConverter.INSTANCE.convert(String.class, properties
+ .get(ContentModel.PROP_TITLE)));
+ assertEquals("Property " + ContentModel.PROP_DESCRIPTION
+ + " not found for mimetype " + mimetype, QUICK_DESCRIPTION,
+ DefaultTypeConverter.INSTANCE.convert(String.class, properties
+ .get(ContentModel.PROP_DESCRIPTION)));
+ }
+
+ protected Map extractFromMimetype() throws Exception
+ {
+ Map properties = new HashMap();
+
+ // attempt to get a source file for each mimetype
+ File sourceFile = AbstractContentTransformerTest.loadQuickTestFile("doc");
+ if (sourceFile == null)
+ {
+ throw new FileNotFoundException("No quick.doc file found for test");
+ }
+
+ // construct a reader onto the source file
+ ContentReader sourceReader = new FileContentReader(sourceFile);
+ sourceReader.setMimetype(MimetypeMap.MIMETYPE_WORD);
+
+ OpenOfficeMetadataWorker worker = (OpenOfficeMetadataWorker) ctx.getBean("extracter.worker.JodConverter");
+
+ Set supportedTypes = new HashSet();
+ supportedTypes.add(MimetypeMap.MIMETYPE_WORD);
+ JodConverterMetadataExtracter extracter = new JodConverterMetadataExtracter(supportedTypes);
+ extracter.setMimetypeService(serviceRegistry.getMimetypeService());
+ extracter.setDictionaryService(serviceRegistry.getDictionaryService());
+ extracter.setWorker(worker);
+
+ extracter.init();
+
+ extracter.extract(sourceReader, properties);
+ return properties;
+ }
+}
diff --git a/src/test/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracterTest.java b/src/test/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracterTest.java
deleted file mode 100644
index c96ebcab98..0000000000
--- a/src/test/java/org/alfresco/repo/content/metadata/OpenOfficeMetadataExtracterTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
-/*
- * Copyright (C) 2005 Jesper Steen Møller
- *
- * This file is part of Alfresco
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- */
-package org.alfresco.repo.content.metadata;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.alfresco.repo.content.MimetypeMap;
-import org.alfresco.service.namespace.QName;
-
-
-/**
- * Note - this test can sometimes fail if run on its own, as there
- * can be a race condition with the OO process. Try running it as
- * part of a suite if so, that normally seems to fix it!
- *
- * @author Jesper Steen Møller
- */
-public class OpenOfficeMetadataExtracterTest extends AbstractMetadataExtracterTest
-{
- private OpenOfficeMetadataExtracter extracter;
-
- @Override
- public void setUp() throws Exception
- {
- super.setUp();
-
- OpenOfficeMetadataWorker worker = (OpenOfficeMetadataWorker) ctx.getBean("extracter.worker.OpenOffice");
-
- extracter = new OpenOfficeMetadataExtracter();
- extracter.setMimetypeService(mimetypeMap);
- extracter.setDictionaryService(dictionaryService);
- extracter.setWorker(worker);
- extracter.init();
- }
-
- /**
- * @return Returns the same extracter regardless - it is allowed
- */
- protected MetadataExtracter getExtracter()
- {
- return extracter;
- }
-
- public void testReliability() throws Exception
- {
- if (!extracter.isConnected())
- {
- return;
- }
-
- for (String mimetype : OpenOfficeMetadataExtracter.SUPPORTED_MIMETYPES)
- {
- assertTrue("Expected above zero reliability", extracter.isSupported(mimetype));
- }
- }
-
- public void testSupportedMimetypes() throws Exception
- {
- // If this test method is run on its own, then it may run to completion before the OOo connection is reconnected.
- // To fully run this test method (with full execution of the various extractions) you need to debug it,
- // put a breakpoint below (at extracter.isConnected()) and wait for
- // "[alfresco.util.OpenOfficeConnectionTester] The OpenOffice connection was re-established" in the log before
- // proceeding. Otherwise the extracter is not "connected" and the tests are short-circuited.
- //
- // When run on the build server, the timings are such that the OOo connection is available.
- if (!extracter.isConnected())
- {
- return;
- }
- for (String mimetype : OpenOfficeMetadataExtracter.SUPPORTED_MIMETYPES)
- {
- testExtractFromMimetype(mimetype);
- }
- }
-
- /**
- * Only run the check if we have a connection
- * to an OpenOffice instance
- */
- protected void testCommonMetadata(String mimetype,
- Map properties) {
- if(extracter.isConnected()) {
- super.testCommonMetadata(mimetype, properties);
- }
- }
-
- protected boolean skipAuthorCheck(String mimetype)
- {
- // The following 'quick' files have no author/creator property and so should not
- // have its value checked.
- List mimeTypesWithNoAuthor = new ArrayList();
- mimeTypesWithNoAuthor.add(MimetypeMap.MIMETYPE_STAROFFICE5_IMPRESS);
- mimeTypesWithNoAuthor.add(MimetypeMap.MIMETYPE_OPENOFFICE1_IMPRESS);
-
- return mimeTypesWithNoAuthor.contains(mimetype);
- }
-
-
- /** Extractor only does the usual basic three properties */
- public void testFileSpecificMetadata(String mimetype, Map properties) {}
-}
diff --git a/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java b/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java
index 7a7f4fd553..e4b1de2065 100644
--- a/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java
+++ b/src/test/java/org/alfresco/repo/content/transform/AbstractContentTransformerTest.java
@@ -48,6 +48,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.cmr.repository.MimetypeService;
+import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.TempFileProvider;
import org.alfresco.util.exec.RuntimeExec;
@@ -449,32 +450,8 @@ public abstract class AbstractContentTransformerTest extends TestCase
*/
protected boolean isOpenOfficeWorkerAvailable() throws InterruptedException
{
- // workaround for build machines (originally taken from OpenOfficeContentTransformerTest)
- ContentTransformerWorker ooWorker = (ContentTransformerWorker) ctx.getBean("transformer.worker.OpenOffice");
-
- if (!ooWorker.isAvailable())
- {
- // TODO - temporarily attempt to start LibreOffice/OpenOffice (eg. when locally running individual test class &/or method)
- // TODO - can we remove this once we have fixed repo startup issue (where LO/OO may not start first time) ?
- ChildApplicationContextFactory oooDirectSubsystem = (ChildApplicationContextFactory) ctx.getBean("OOoDirect");
- oooDirectSubsystem.start();
-
- Thread.sleep(5000);
-
- RuntimeExec runtimeExec = (RuntimeExec) oooDirectSubsystem.getApplicationContext().getBean("openOfficeStartupCommand");
- runtimeExec.execute();
-
- Thread.sleep(5000);
-
- if (!ooWorker.isAvailable())
- {
- if (failTestIfOOWorkerUnavailable)
- {
- fail("Failed to run test - ooWorker not available");
- }
- return false;
- }
- }
- return true;
+ ChildApplicationContextFactory jodconverterSubsystem = (ChildApplicationContextFactory) ctx.getBean("OOoJodconverter");
+ JodContentTransformer jodContentTransformer = (JodContentTransformer)jodconverterSubsystem.getApplicationContext().getBean("transformer.worker.JodConverter");
+ return jodContentTransformer.isAvailable();
}
}
diff --git a/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java b/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java
index b962e30b24..7f049d3aed 100644
--- a/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java
+++ b/src/test/java/org/alfresco/repo/content/transform/ComplexContentTransformerTest.java
@@ -49,7 +49,7 @@ public class ComplexContentTransformerTest extends AbstractContentTransformerTes
{
super.setUp();
- ContentTransformer unoTransformer = (ContentTransformer) ctx.getBean("transformer.OpenOffice");
+ ContentTransformer unoTransformer = (ContentTransformer) ctx.getBean("transformer.JodConverter");
ContentTransformer pdfBoxTransformer = (ContentTransformer) ctx.getBean("transformer.PdfBox");
// make sure that they are working for this test
if (unoTransformer.isTransformable(MimetypeMap.MIMETYPE_PPT, -1, MimetypeMap.MIMETYPE_PDF, new TransformationOptions()) == false)
diff --git a/src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java b/src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java
new file mode 100644
index 0000000000..0f0ae7f288
--- /dev/null
+++ b/src/test/java/org/alfresco/repo/content/transform/JodContentTransformerOOoTest.java
@@ -0,0 +1,87 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.content.transform;
+
+import static org.junit.Assert.assertNotNull;
+
+import org.alfresco.repo.content.AbstractJodConverterBasedTest;
+import org.alfresco.model.ContentModel;
+import org.alfresco.repo.thumbnail.ThumbnailDefinition;
+import org.alfresco.repo.thumbnail.ThumbnailRegistry;
+import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
+import org.alfresco.service.cmr.repository.NodeRef;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+
+/**
+ *
+ * @author Neil McErlean
+ * @since 3.2 SP1
+ */
+public class JodContentTransformerOOoTest extends AbstractJodConverterBasedTest
+{
+ private static Log log = LogFactory.getLog(JodContentTransformerOOoTest.class);
+
+ /**
+ * This test method tests the built-in thumbnail transformations - all for a Word source document.
+ * This will include transformations doc-pdf-png and doc-pdf-swf. ALF-2070
+ */
+ @Test
+ public void thumbnailTransformationsUsingJodConverter()
+ {
+ // If OpenOffice is not available then we will ignore this test (by passing it).
+ // This is because not all the build servers have OOo installed.
+ if (!isOpenOfficeAvailable())
+ {
+ System.out.println("Did not run " + this.getClass().getSimpleName() + ".thumbnailTransformationsUsingJodConverter" +
+ " because OOo is not available.");
+ return;
+ }
+
+ transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback()
+ {
+ public Void execute() throws Throwable
+ {
+ ThumbnailRegistry thumbnailRegistry = thumbnailService.getThumbnailRegistry();
+ for (ThumbnailDefinition thumbDef : thumbnailRegistry.getThumbnailDefinitions())
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Testing thumbnail definition " + thumbDef.getName());
+ }
+
+ NodeRef thumbnail = thumbnailService.createThumbnail(contentNodeRef, ContentModel.PROP_CONTENT,
+ thumbDef.getMimetype(), thumbDef.getTransformationOptions(), thumbDef.getName());
+
+ assertNotNull("Thumbnail was unexpectedly null.", thumbnail);
+ }
+
+ return null;
+ }
+ });
+ }
+}
diff --git a/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java b/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
index df6e1d66f5..439da195cd 100644
--- a/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
+++ b/src/test/java/org/alfresco/repo/content/transform/OpenOfficeContentTransformerTest.java
@@ -37,7 +37,8 @@ import org.alfresco.service.cmr.repository.TransformationOptions;
import org.alfresco.util.TempFileProvider;
/**
- * @see org.alfresco.repo.content.transform.OpenOfficeContentTransformerWorker
+ * We no longer use ooo.direct in Community. This test class now is connnected up to the JODConverter which was moved
+ * from the Enterprise Edition.
*
* @author Derek Hulley
*/
@@ -53,7 +54,7 @@ public class OpenOfficeContentTransformerTest extends AbstractContentTransformer
{
super.setUp();
- this.worker = (ContentTransformerWorker) ctx.getBean("transformer.worker.OpenOffice");
+ this.worker = (ContentTransformerWorker) ctx.getBean("transformer.worker.JodConverter");
transformer = new ProxyContentTransformer();
transformer.setMimetypeService(mimetypeService);
transformer.setTransformerDebug(transformerDebug);
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java b/src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java
new file mode 100644
index 0000000000..937d22a772
--- /dev/null
+++ b/src/test/java/org/alfresco/repo/content/transform/TransformerPropertiesTest.java
@@ -0,0 +1,90 @@
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2017 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
+package org.alfresco.repo.content.transform;
+
+import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Matchers;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Properties;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.when;
+
+/**
+ * Test class for TransformerProperties. Currently just that The old oooDirect (OpenOffice) transformer settings
+ * are aliased to JodConverter settings if they are not set up.
+ *
+ * @author Alan Davis
+ */
+public class TransformerPropertiesTest
+{
+ @Mock
+ private ChildApplicationContextFactory subsystem;
+
+ private TransformerProperties transformerProperties;
+ private Properties globalProperties;
+
+ @Before
+ public void setUp() throws Exception
+ {
+ MockitoAnnotations.initMocks(this);
+ globalProperties = new Properties();
+ transformerProperties = new TransformerProperties(subsystem, globalProperties);
+ }
+
+ @Test
+ public void aliasOpenOfficeToJodTest()
+ {
+ when(subsystem.getProperty(Matchers.any())).thenReturn(null);
+
+ // Should be picked up as normal
+ globalProperties.setProperty("content.transformer.complex.JodConverter.Image.priority", "150");
+
+ // JodConverter value should override the OpenOffice value
+ globalProperties.setProperty("content.transformer.complex.OpenOffice.Image.extensions.docx.txt.supported", "true");
+ globalProperties.setProperty("content.transformer.complex.JodConverter.Image.extensions.docx.txt.supported", "false");
+
+ // Should be picked up as a JodConverter value
+ globalProperties.setProperty("content.transformer.complex.OpenOffice.Image.extensions.xlsb.txt.maxSourceSizeKBytes", "1024");
+
+ Set propertyNames = transformerProperties.getPropertyNames();
+
+ assertEquals("The combined settings should be seen as only three entries", 3, propertyNames.size());
+ assertTrue(propertyNames.contains("content.transformer.complex.JodConverter.Image.priority"));
+ assertTrue(propertyNames.contains("content.transformer.complex.JodConverter.Image.extensions.docx.txt.supported"));
+ assertTrue(propertyNames.contains("content.transformer.complex.JodConverter.Image.extensions.xlsb.txt.maxSourceSizeKBytes"));
+
+ assertEquals("150", transformerProperties.getProperty("content.transformer.complex.JodConverter.Image.priority"));
+ assertEquals("false", transformerProperties.getProperty("content.transformer.complex.JodConverter.Image.extensions.docx.txt.supported"));
+ assertEquals("1024", transformerProperties.getProperty("content.transformer.complex.JodConverter.Image.extensions.xlsb.txt.maxSourceSizeKBytes"));
+ }
+}
diff --git a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java b/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java
index 330f5f04eb..296eb0bc22 100644
--- a/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java
+++ b/src/test/java/org/alfresco/repo/content/transform/TransformerPropertySetterTest.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software.
- * If the software was purchased under a paid Alfresco license, the terms of
- * the paid license agreement will prevail. Otherwise, the software is
- * provided under the following open source license terms:
- *
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Alfresco 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 Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see .
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software.
+ * If the software was purchased under a paid Alfresco license, the terms of
+ * the paid license agreement will prevail. Otherwise, the software is
+ * provided under the following open source license terms:
+ *
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Alfresco 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see .
+ * #L%
+ */
package org.alfresco.repo.content.transform;
import static org.junit.Assert.assertEquals;
@@ -150,58 +150,58 @@ public class TransformerPropertySetterTest
verify(transformerProperties).setProperties(expectedProperties("Transformer.LOG.entries", "12"));
}
- @Test
- public void debugLogSizeTest()
- {
- setter.setProperties(
- "transformer.log.entries=12\n" +
- "transformer.debug.entries=-1");
-
- verify(transformerProperties).setProperties(expectedProperties(
- "transformer.debug.entries", "-1",
- "transformer.log.entries", "12"));
- }
-
- @Test
- public void mimetypeListTest()
- {
- setter.setProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes=image/png;application/pdf");
-
- verify(transformerProperties).setProperties(expectedProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes", "image/png;application/pdf"));
- }
-
- public void mimetypeListBlankTest()
- {
- setter.setProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes=");
-
- verify(transformerProperties).setProperties(expectedProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes", ""));
- }
-
- @Test(expected=IllegalArgumentException.class)
- public void mimetypeListUnevenTest()
- {
- setter.setProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes=image/png");
- }
-
- @Test(expected=IllegalArgumentException.class)
- public void mimetypeListBadDeclaredTypeTest()
- {
- setter.setProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes=BAD;image/png");
- }
-
- public void mimetypeListBadDetectedTypeTest()
- {
- // Tika may detect a mimetype we have not registered, so let it through
- setter.setProperties(
- "transformer.strict.mimetype.check.whitelist.mimetypes=image/png;BAD");
- }
-
+ @Test
+ public void debugLogSizeTest()
+ {
+ setter.setProperties(
+ "transformer.log.entries=12\n" +
+ "transformer.debug.entries=-1");
+
+ verify(transformerProperties).setProperties(expectedProperties(
+ "transformer.debug.entries", "-1",
+ "transformer.log.entries", "12"));
+ }
+
+ @Test
+ public void mimetypeListTest()
+ {
+ setter.setProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes=image/png;application/pdf");
+
+ verify(transformerProperties).setProperties(expectedProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes", "image/png;application/pdf"));
+ }
+
+ public void mimetypeListBlankTest()
+ {
+ setter.setProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes=");
+
+ verify(transformerProperties).setProperties(expectedProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes", ""));
+ }
+
+ @Test(expected=IllegalArgumentException.class)
+ public void mimetypeListUnevenTest()
+ {
+ setter.setProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes=image/png");
+ }
+
+ @Test(expected=IllegalArgumentException.class)
+ public void mimetypeListBadDeclaredTypeTest()
+ {
+ setter.setProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes=BAD;image/png");
+ }
+
+ public void mimetypeListBadDetectedTypeTest()
+ {
+ // Tika may detect a mimetype we have not registered, so let it through
+ setter.setProperties(
+ "transformer.strict.mimetype.check.whitelist.mimetypes=image/png;BAD");
+ }
+
@Test(expected=IllegalArgumentException.class)
public void badPropertyNameTest()
{
@@ -572,7 +572,7 @@ public class TransformerPropertySetterTest
}
@Test
- public void removeSimplePropetyTest()
+ public void removeSimplePropertyTest()
{
mockProperties(transformerProperties, "transformer.log.entries", "12");
diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties
index 1ce9e6f8e8..d710d1ab11 100644
--- a/src/test/resources/log4j.properties
+++ b/src/test/resources/log4j.properties
@@ -59,9 +59,6 @@ log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error
log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error
log4j.logger.org.apache.myfaces.taglib=error
-# OpenOfficeConnection
-log4j.logger.net.sf.jooreports.openoffice.connection=fatal
-
# log prepared statement cache activity ###
log4j.logger.org.hibernate.ps.PreparedStatementCache=info
@@ -105,7 +102,6 @@ log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info
log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn
log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn
log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info
-log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info
log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn
log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn
log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=debug