Author: vdegtyarev
Date: Thu Oct 13 09:23:00 2016
New Revision: 1764636

URL: http://svn.apache.org/viewvc?rev=1764636&view=rev
Log:
OPENMEETINGS-1490 is fixed. Jodconverter is added to openmeetings project. 
Merge to 3.1.x.

Modified:
    openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
    
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
    
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
    
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
    
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java

Modified: openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/pom.xml Thu Oct 
13 09:23:00 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/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/documents/GeneratePDF.java
 Thu Oct 13 09:23:00 2016
@@ -21,8 +21,6 @@ package org.apache.openmeetings.core.doc
 import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
 
 import java.io.File;
-import java.io.FilenameFilter;
-import java.util.ArrayList;
 
 import org.apache.commons.transaction.util.FileHelper;
 import org.apache.openmeetings.core.converter.GenerateSWF;
@@ -31,7 +29,10 @@ import org.apache.openmeetings.db.dao.ba
 import org.apache.openmeetings.util.OmFileHelper;
 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;
@@ -102,59 +103,30 @@ public class GeneratePDF {
        }
 
        /**
-        * Generates PDF using JOD Library (external library)
+        * Generates PDF using JOD Library
         */
        public ConverterProcessResult doJodConvert(File fileFullPath, File 
destinationFolder, String outputfile) {
                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()) {
-                               throw new Exception("Path to JOD Library folder 
does not exist");
-                       }
-
-                       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());
-                               }
+                       DefaultOfficeManagerConfiguration configuration = new 
DefaultOfficeManagerConfiguration();
+                       configuration.setOfficeHome(officePath);
+                       OfficeManager officeManager = 
configuration.buildOfficeManager();
+                       officeManager.start();
+                       OfficeDocumentConverter converter = new 
OfficeDocumentConverter(officeManager);
+                       try {
+                               converter.convert(fileFullPath, new 
File(destinationFolder, outputfile + ".pdf"));
+                       } catch (OfficeException ex) {
+                               log.error("doJodConvert", ex);
+                               return new 
ConverterProcessResult("doJodConvert", ex.getMessage(), ex);
+                       } finally {
+                                       officeManager.stop();
                        }
-                       if (jodConverterJar.length() == 0) {
-                               throw new Exception("Could not find 
jodConverter JAR file in JOD folder");
-                       }
-
-                       argv.add("-jar");
-                       argv.add(new File(jodFolder, 
jodConverterJar).getCanonicalPath());
-                       argv.add(fileFullPath.getCanonicalPath());
-                       argv.add(new File(destinationFolder, outputfile + 
".pdf").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.setExitValue("0");
+               return result;
        }
-
-       
-
 }

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
 Thu Oct 13 09:23:00 2016
@@ -243,8 +243,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/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
 Thu Oct 13 09:23:00 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&auml;lt.]]></entry>
-       <entry key="install.wizard.params.step3.jodPath.text"></entry>
        <entry 
key="install.wizard.params.step3.officePath"><![CDATA[OpenOffice-/LibreOffice-Pfad
 f&uuml;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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
 Thu Oct 13 09:23:00 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/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
 Thu Oct 13 09:23:00 2016
@@ -99,32 +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"
-                               type="text" />
-                               <p>
-                                       <i>
-                                               <wicket:message 
key="install.wizard.params.step3.officePath.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>
                </ul>
        </fieldset>
 </wicket:panel>

Modified: 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1764636&r1=1764635&r2=1764636&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
 (original)
+++ 
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
 Thu Oct 13 09:23:00 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"));
                }
 


Reply via email to