Author: solomax
Date: Fri Jul 19 05:23:30 2013
New Revision: 1504762
URL: http://svn.apache.org/r1504762
Log:
Initial installation parameter types are changed from String to Integer for
smptPort, swfJpegQuality and swfJpegZoom.
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java?rev=1504762&r1=1504761&r2=1504762&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
(original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/cli/Admin.java
Fri Jul 19 05:23:30 2013
@@ -227,7 +227,7 @@ public class Admin {
cfg.smtpServer =
cmdl.getOptionValue("smtp-server");
}
if (cmdl.hasOption("smtp-port")) {
- cfg.smtpPort =
cmdl.getOptionValue("smtp-port");
+ cfg.smtpPort =
Integer.valueOf(cmdl.getOptionValue("smtp-port"));
}
if (cmdl.hasOption("email-auth-user")) {
cfg.mailAuthName =
cmdl.getOptionValue("email-auth-user");
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1504762&r1=1504761&r2=1504762&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/ImportInitvalues.java
Fri Jul 19 05:23:30 2013
@@ -299,7 +299,7 @@ public class ImportInitvalues {
configurationDao.add("smtp_server", cfg.smtpServer, null,
"this is the smtp server to send messages");
// 25
- configurationDao.add("smtp_port", cfg.smtpPort, null,
+ configurationDao.add("smtp_port", "" + cfg.smtpPort, null,
"this is the smtp server port normally 25");
// "[email protected]"
configurationDao.add("system_email_addr", cfg.mailReferer,
@@ -322,11 +322,11 @@ public class ImportInitvalues {
configurationDao.add(DEFAUT_LANG_KEY, cfg.defaultLangId,
null, "Default System Language ID see
languages.xml");
- configurationDao.add("swftools_zoom", cfg.swfZoom, null,
+ configurationDao.add("swftools_zoom", "" + cfg.swfZoom, null,
"dpi for conversion of PDF to SWF (should be an
integer between 50 and 600 with a default value of 100 dpi)");
configurationDao.add("swftools_jpegquality",
- cfg.swfJpegQuality, null,
+ "" + cfg.swfJpegQuality, null,
"compression quality for conversion of PDF to
SWF (should be an integer between 1 and 100, with a default value of 85)");
configurationDao.add("swftools_path", cfg.swfPath, null,
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java?rev=1504762&r1=1504761&r2=1504762&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/installation/InstallationConfig.java
Fri Jul 19 05:23:30 2013
@@ -37,15 +37,15 @@ public class InstallationConfig implemen
public String cryptClassName =
MD5Implementation.class.getCanonicalName();
//email
- public String smtpPort = "25";
+ public Integer smtpPort = 25;
public String smtpServer = "localhost";
public String mailAuthName = "";
public String mailAuthPass = "";
public String mailReferer = "[email protected]";
public String mailUseTls = "0";
//paths
- public String swfZoom = "100";
- public String swfJpegQuality = "85";
+ public Integer swfZoom = 100;
+ public Integer swfJpegQuality = 85;
public String swfPath = "";
public String imageMagicPath = "";
public String ffmpegPath = "";
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1504762&r1=1504761&r2=1504762&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/install/InstallWizard.java
Fri Jul 19 05:23:30 2013
@@ -193,7 +193,7 @@ public class InstallWizard extends Wizar
add(new YesNoDropDown("createDefaultRooms"));
add(new TextField<String>("cfg.mailReferer"));
add(new TextField<String>("cfg.smtpServer"));
- add(new TextField<String>("cfg.smtpPort"));
+ add(new TextField<Integer>("cfg.smtpPort"));
add(new TextField<String>("cfg.mailAuthName"));
add(new PasswordTextField("cfg.mailAuthPass").setRequired(false));
add(new YesNoDropDown("mailUseTls"));
@@ -228,8 +228,8 @@ public class InstallWizard extends Wizar
public ParamsStep3() {
super(paramsStep2);
- add(new TextField<String>("cfg.swfZoom").add(range(50, 600)));
- add(new TextField<String>("cfg.swfJpegQuality").add(range(1,
100)));
+ add(new TextField<Integer>("cfg.swfZoom").add(range(50, 600)));
+ add(new TextField<Integer>("cfg.swfJpegQuality").add(range(1,
100)));
add(new TextField<String>("cfg.swfPath"));
add(new TextField<String>("cfg.imageMagicPath"));
add(new TextField<String>("cfg.ffmpegPath"));
