Author: vdegtyarev
Date: Thu Oct 13 04:31:39 2016
New Revision: 1764581
URL: http://svn.apache.org/viewvc?rev=1764581&view=rev
Log:
OPENMEETINGS-1490 minor changes. Remove unused Jodconverter params.
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Modified:
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1764581&r1=1764580&r2=1764581&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
Thu Oct 13 04:31:39 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/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1764581&r1=1764580&r2=1764581&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
Thu Oct 13 04:31:39 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.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1764581&r1=1764580&r2=1764581&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
Thu Oct 13 04:31:39 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"));
}
