Author: vdegtyarev Date: Thu Oct 13 10:17:12 2016 New Revision: 1764647 URL: http://svn.apache.org/viewvc?rev=1764647&view=rev Log: OPENMEETINGS-1490 is fixed. Jodconverter is added to openmeetings project. Merge to trunk.
Modified: openmeetings/application/trunk/openmeetings-core/pom.xml openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Modified: openmeetings/application/trunk/openmeetings-core/pom.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/pom.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/pom.xml (original) +++ openmeetings/application/trunk/openmeetings-core/pom.xml Thu Oct 13 10:17:12 2016 @@ -93,6 +93,11 @@ <artifactId>javax.mail</artifactId> <version>${mail.version}</version> </dependency> + <dependency> + <groupId>org.artofsolving.jodconverter</groupId> + <artifactId>jodconverter-core</artifactId> + <version>3.0.1-om</version> + </dependency> <!-- Test dependencies --> <dependency> <groupId>org.red5</groupId> Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java Thu Oct 13 10:17:12 2016 @@ -23,8 +23,6 @@ import static org.apache.openmeetings.ut import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey; import java.io.File; -import java.io.FilenameFilter; -import java.util.ArrayList; import org.apache.openmeetings.core.converter.GenerateSWF; import org.apache.openmeetings.core.converter.GenerateThumbs; @@ -32,7 +30,10 @@ import org.apache.openmeetings.db.dao.ba import org.apache.openmeetings.db.entity.file.FileExplorerItem; import org.apache.openmeetings.util.process.ConverterProcessResult; import org.apache.openmeetings.util.process.ConverterProcessResultList; -import org.apache.openmeetings.util.process.ProcessHelper; +import org.artofsolving.jodconverter.OfficeDocumentConverter; +import org.artofsolving.jodconverter.office.DefaultOfficeManagerConfiguration; +import org.artofsolving.jodconverter.office.OfficeException; +import org.artofsolving.jodconverter.office.OfficeManager; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -73,51 +74,26 @@ public class GeneratePDF { */ public ConverterProcessResult doJodConvert(File in, File out) { try { - String jodPath = configurationDao.getConfValue("jod.path", String.class, "./jod"); String officePath = configurationDao.getConfValue("office.path", String.class, ""); - - File jodFolder = new File(jodPath); - if (!jodFolder.exists() || !jodFolder.isDirectory()) { - return new ConverterProcessResult("doJodConvert", "Path to JOD Library folder does not exist", null); - } - - ArrayList<String> argv = new ArrayList<String>(); - argv.add("java"); - - if (officePath.trim().length() > 0) { - argv.add("-Doffice.home=" + officePath); - } - String jodConverterJar = ""; - - String[] list = jodFolder.list(new FilenameFilter() { - @Override - public boolean accept(File file1, String name) { - return name.endsWith(".jar"); - } - }); - if (list != null) { - for (String jar : list) { - argv.add("-cp"); - if (jar.startsWith("jodconverter")) { - jodConverterJar = jar; - } - argv.add(new File(jodFolder, jar).getCanonicalPath()); - } - } - if (jodConverterJar.length() == 0) { - throw new Exception("Could not find jodConverter JAR file in JOD folder"); + DefaultOfficeManagerConfiguration configuration = new DefaultOfficeManagerConfiguration(); + configuration.setOfficeHome(officePath); + OfficeManager officeManager = configuration.buildOfficeManager(); + officeManager.start(); + OfficeDocumentConverter converter = new OfficeDocumentConverter(officeManager); + try { + converter.convert(in, out); + } catch (OfficeException ex) { + log.error("doJodConvert", ex); + return new ConverterProcessResult("doJodConvert", ex.getMessage(), ex); + } finally { + officeManager.stop(); } - - argv.add("-jar"); - argv.add(new File(jodFolder, jodConverterJar).getCanonicalPath()); - argv.add(in.getCanonicalPath()); - argv.add(out.getCanonicalPath()); - - return ProcessHelper.executeScript("doJodConvert", argv.toArray(new String[argv.size()])); - } catch (Exception ex) { log.error("doJodConvert", ex); return new ConverterProcessResult("doJodConvert", ex.getMessage(), ex); } + ConverterProcessResult result = new ConverterProcessResult("doJodConvert", "Document converted successfully", null); + result.setExitCode(0); + return result; } } Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Thu Oct 13 10:17:12 2016 @@ -245,8 +245,6 @@ public class ImportInitvalues { cfgDao.add("ffmpeg_path", cfg.ffmpegPath, null, "Path To FFMPEG"); cfgDao.add("office.path", cfg.officePath, null, "The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically"); - cfgDao.add("jod.path", cfg.jodPath, null, - "The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar"); cfgDao.add(CONFIG_RSS_FEED1_KEY, cfg.urlFeed, null, "Feed URL"); Modified: openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java (original) +++ openmeetings/application/trunk/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java Thu Oct 13 10:17:12 2016 @@ -52,7 +52,6 @@ public class InstallationConfig implemen public String imageMagicPath = ""; public String ffmpegPath = ""; public String soxPath = ""; - public String jodPath = "/opt/jod/lib"; public String officePath = ""; public String defaultLangId = "1"; @@ -78,7 +77,7 @@ public class InstallationConfig implemen + ", mailUseTls=" + mailUseTls + ", swfZoom=" + swfZoom + ", swfJpegQuality=" + swfJpegQuality + ", swfPath=" + swfPath + ", imageMagicPath=" + imageMagicPath + ", ffmpegPath=" - + ffmpegPath + ", soxPath=" + soxPath + ", jodPath=" + jodPath + + ffmpegPath + ", soxPath=" + soxPath + ", defaultLangId=" + defaultLangId + ", sendEmailAtRegister=" + sendEmailAtRegister + ", urlFeed=" + urlFeed + ", urlFeed2=" + urlFeed2 + ", sendEmailWithVerficationCode=" Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml Thu Oct 13 10:17:12 2016 @@ -1820,9 +1820,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml Thu Oct 13 10:17:12 2016 @@ -1829,9 +1829,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX-Pfad</entry> <entry key="install.wizard.params.step3.soxPath.title">Geben Sie den Pfad zu SoX an, falls es sich nicht im Systempfad befindet.</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD-Pfad</entry> - <entry key="install.wizard.params.step3.jodPath.title"><![CDATA[Der Pfad zur JOD-Bibliothek (http://code.google.com/p/jodconverter). Beachten Sie, dass der Pfad auf das lib-Verzeichnis zeigen muss, welches auch jodconverter-core-version.jar enthält.]]></entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice-/LibreOffice-Pfad für jodconverter]]></entry> <entry key="install.wizard.params.step3.officePath.title">Der Pfad zu OpenOffice/LibreOffice (optional). Bitte geben Sie den echten Pfad an, falls jodconverter die OpenOffice-/LibreOffice-Installation nicht automatisch findet.</entry> <entry key="install.wizard.params.step3.officePath.text">Der Pfad zu OpenOffice/LibreOffice (optional). Bitte geben Sie den richtigen Pfad an, falls Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml Thu Oct 13 10:17:12 2016 @@ -1817,9 +1817,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path (Ruta)</entry> <entry key="install.wizard.params.step3.soxPath.title">Introduzca la ruta a SOX, o déjelo en blanco si SOX está registrado en el path del sistema</entry> <entry key="install.wizard.params.step3.soxPath.text"/> - <entry key="install.wizard.params.step3.jodPath">JOD Path (Ruta)</entry> - <entry key="install.wizard.params.step3.jodPath.title">Ruta a la libreria JOD (http://code.google.com/p/jodconverter), introduzca la ruta al directorio lib donde se encuentra el archivo jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"/> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path (Ruta) para jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">Ruta a OpenOffice/LibreOffice (opcional), por favor introdúzcala en el caso que jodconverter no encuentre a OpenOffice/LibreOffice automáticamente</entry> <entry key="install.wizard.params.step3.officePath.text">El path (ruta) a OpenOffice/LibreOffice (opcional) por favor configúrelo correctamente en caso de que jodconverter no pueda encontrar la instalación de OpenOffice/LibreOffice Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml Thu Oct 13 10:17:12 2016 @@ -1792,9 +1792,6 @@ <entry key="install.wizard.params.step3.soxPath">Chemin vers SoX</entry> <entry key="install.wizard.params.step3.soxPath.title">Indiquez le chemin vers SoX dans le cas où SoX ne se trouve pas dans le chemin système.</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">Chemin vers JOD</entry> - <entry key="install.wizard.params.step3.jodPath.title">Chemin vers la bibliothèque JOD (http://code.google.com/p/jodconverter). Configurez le chemin pour pointer vers le répertoire lib de JOD qui contient également le fichier jodconverter-core-version.jar.</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">Chemin vers OpenOffice-/LibreOffice pour jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">Chemin vers OpenOffice/LibreOffice (optionnel). Indiquez le chemin réel dans le cas où jodconverter ne pourrait pas trouver l'installation de OpenOffice-/LibreOffice automatiquement.</entry> <entry key="install.wizard.params.step3.officePath.text">Chemin vers OpenOffice/LibreOffice (optionnel). Indiquez le chemin réel dans le cas où jodconverter ne pourrait pas trouver l'installation de OpenOffice-/LibreOffice automatiquement.</entry> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml Thu Oct 13 10:17:12 2016 @@ -1811,9 +1811,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX útvonala</entry> <entry key="install.wizard.params.step3.soxPath.title">Adja meg a SoX elérési útvonalát, hagyja üresen, ha a SoX elérhetÅ a rendszer útvonalak közt</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD útvonala</entry> - <entry key="install.wizard.params.step3.jodPath.title">A JOD könyvtár útvonala (http://code.google.com/p/jodconverter), a JOD könyvtárban szükséges a jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice útvonala a jodconverterhez</entry> <entry key="install.wizard.params.step3.officePath.title">Adja meg az OpenOffice/LibreOffice (optional) valós útvonalát, a OpenOffice/LibreOffice nem keresi automatikusan a jodconverter</entry> <entry key="install.wizard.params.step3.officePath.text"> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml Thu Oct 13 10:17:12 2016 @@ -1823,9 +1823,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml Thu Oct 13 10:17:12 2016 @@ -1826,9 +1826,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX ÐÑÑÑ</entry> <entry key="install.wizard.params.step3.soxPath.title">УкажиÑе пÑÑÑ Ðº SoX, или не заполнÑйÑе данное поле еÑли SoX ÑÑÑановлен в пÑÑÑÑ ÐаÑей ÑиÑÑемÑ</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD ÐÑÑÑ</entry> - <entry key="install.wizard.params.step3.jodPath.title">ÐÑÑÑ Ðº библиоÑеке JOD (http://code.google.com/p/jodconverter), ÑконÑигÑÑиÑÑйÑе пÑÑÑ, ÑказÑваÑÑий на Ð¿Ð°Ð¿ÐºÑ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñеки JOD, коÑоÑÐ°Ñ ÑодеÑÐ¶Ð¸Ñ jodconverter-core-version.jar Ñайл</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice ÐÑÑÑ Ð´Ð»Ñ jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">ÐÑÑÑ Ðº OpenOffice/LibreOffice (не обÑзаÑелÑнÑй) пожалÑйÑÑа ÑÑÑановиÑе ÑÑÐ¾Ñ Ð¿ÑÑÑ Ð² ÑлÑÑае когда jodconverter не в ÑоÑÑоÑнии найÑи авÑомаÑиÑеÑки пÑÑÑ Ðº ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð¾Ð¼Ñ OpenOffice/LibreOffice</entry> <entry key="install.wizard.params.step3.officePath.text"> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Thu Oct 13 10:17:12 2016 @@ -1826,9 +1826,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX ШлÑÑ </entry> <entry key="install.wizard.params.step3.soxPath.title">ÐкажÑÑÑ ÑлÑÑ Ð´Ð¾ SoX, або не заповнÑйÑе Ñе поле ÑкÑо SoX вÑÑановлений в ÑлÑÑ Ð°Ñ ÐаÑÐ¾Ñ ÑиÑÑеми</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD ШлÑÑ </entry> - <entry key="install.wizard.params.step3.jodPath.title">ШлÑÑ Ð´Ð¾ бÑблÑоÑеки JOD (http://code.google.com/p/jodconverter), налаÑÑÑйÑе ÑлÑÑ , ÑказÑваÑÑий на Ð¿Ð°Ð¿ÐºÑ Ð±ÑблÑоÑеки JOD, Ñка мÑÑÑиÑÑ jodconverter-core-version.jar Ñайл</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice ШлÑÑ Ð´Ð»Ñ jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">ШлÑÑ Ð´Ð¾ OpenOffice/LibreOffice (не обов'Ñзковий) бÑÐ´Ñ Ð»Ð°Ñка, вÑÑановÑÑÑ Ñей ÑлÑÑ , Ñ ÑÐ°Ð·Ñ ÐºÐ¾Ð»Ð¸ jodconverter не в Ð·Ð¼Ð¾Ð·Ñ Ð·Ð½Ð°Ð¹Ñи авÑомаÑиÑно ÑлÑÑ Ð´Ð¾ вÑÑановленого OpenOffice/LibreOffice</entry> <entry key="install.wizard.params.step3.officePath.text"> Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Thu Oct 13 10:17:12 2016 @@ -1796,9 +1796,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX è·¯å¾</entry> <entry key="install.wizard.params.step3.soxPath.title">è¾å ¥SoXçè·¯å¾, å¦æSoXæåå®è£ å°ç³»ç»è·¯å¾ï¼å°±ä¸ç¨å¡«åè¿ä¸ªå段</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD è·¯å¾</entry> - <entry key="install.wizard.params.step3.jodPath.title">å°JODåºçè·¯å¾ (http://code.google.com/p/jodconverter), é 置路å¾æåJODçlibç®å½ï¼ å®å å«jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOfficeåLibreOffice使ç¨jodconverterçè·¯å¾</entry> <entry key="install.wizard.params.step3.officePath.title">OpenOfficeåLibreOfficeçè·¯å¾ï¼å¯éï¼ï¼è¯·æå®æåçå®è·¯å¾ï¼ä»¥é² jodconverterä¸è½èªå¨æ¾å°OpenOffice/LibreOffice å®è£ </entry> <entry key="install.wizard.params.step3.officePath.text">OpenOfficeåLibreOfficeçè·¯å¾ï¼å¯éï¼ï¼è¯·æå®æåçå®è·¯å¾ï¼ä»¥é² jodconverterä¸è½èªå¨æ¾å°OpenOffice/LibreOffice å®è£ Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Thu Oct 13 10:17:12 2016 @@ -1821,9 +1821,6 @@ <entry key="install.wizard.params.step3.soxPath">SoX Path</entry> <entry key="install.wizard.params.step3.soxPath.title">Enter the path to SoX, leave blank if SoX is successfully installed to system-path</entry> <entry key="install.wizard.params.step3.soxPath.text"></entry> - <entry key="install.wizard.params.step3.jodPath">JOD Path</entry> - <entry key="install.wizard.params.step3.jodPath.title">The path to JOD library (http://code.google.com/p/jodconverter), configure the path to point to the lib directory of JOD that contains also the jodconverter-core-version.jar</entry> - <entry key="install.wizard.params.step3.jodPath.text"></entry> <entry key="install.wizard.params.step3.officePath">OpenOffice/LibreOffice Path for jodconverter</entry> <entry key="install.wizard.params.step3.officePath.title">The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically</entry> <entry key="install.wizard.params.step3.officePath.text">The path to OpenOffice/LibreOffice (optional) please set this Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html Thu Oct 13 10:17:12 2016 @@ -99,19 +99,6 @@ </i> </p> </li> - <li><label wicket:for="jodPath"><wicket:message key="install.wizard.params.step3.jodPath"/></label> - <input wicket:id="jodPath" - wicket:message="title:install.wizard.params.step3.jodPath.title" - type="text" /> - <p> - <i> - <wicket:message key="install.wizard.params.step3.jodPath.text"/> - <wicket:message key="install.wizard.params.step3.seeAlso"/> <a - href="http://openmeetings.apache.org/installation.html" - target="_blank"><wicket:message key="install.wizard.params.step3.installation"/></a> - </i> - </p> - </li> <li><label wicket:for="officePath"><wicket:message key="install.wizard.params.step3.officePath"/></label> <input wicket:id="officePath" wicket:message="title:install.wizard.params.step3.officePath.title" Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1764647&r1=1764646&r2=1764647&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original) +++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Thu Oct 13 10:17:12 2016 @@ -483,7 +483,6 @@ public class InstallWizard extends Abstr add(new TextField<String>("imageMagicPath")); add(new TextField<String>("ffmpegPath")); add(new TextField<String>("soxPath")); - add(new TextField<String>("jodPath")); add(new TextField<String>("officePath")); }