Repository: openmeetings Updated Branches: refs/heads/master 91a308538 -> 0bec78526
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0bec7852 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0bec7852 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0bec7852 Branch: refs/heads/master Commit: 0bec785260478a3b4220720cfc69dcb1f9992288 Parents: 91a3085 Author: Maxim Solodovnik <[email protected]> Authored: Fri Sep 29 20:21:40 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Sep 29 20:21:40 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/cli/Admin.java | 54 ++-- .../installation/ImportInitvalues.java | 59 ++-- .../installation/InstallationConfig.java | 304 +++++++++++++++++-- .../web/pages/BaseNotInitedPage.java | 2 +- .../install/InstallWizard$ParamsStep1.html | 4 +- .../web/pages/install/InstallWizard.java | 10 +- .../test/AbstractJUnitDefaults.java | 12 +- .../test/webservice/TestRoomService.java | 4 +- .../openmeetings/webservice/RoomWebService.java | 2 +- 9 files changed, 345 insertions(+), 106 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java index 1a478a5..da7f7bc 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/Admin.java @@ -41,6 +41,7 @@ import org.apache.commons.cli.OptionGroup; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; import org.apache.commons.io.FileUtils; +import org.apache.directory.api.util.Strings; import org.apache.openjpa.jdbc.conf.JDBCConfiguration; import org.apache.openjpa.jdbc.conf.JDBCConfigurationImpl; import org.apache.openjpa.jdbc.schema.SchemaTool; @@ -65,7 +66,6 @@ import org.apache.openmeetings.util.ConnectionProperties; import org.apache.openmeetings.util.ImportHelper; import org.apache.openmeetings.util.OmFileHelper; import org.apache.openmeetings.util.mail.MailUtil; -import org.apache.wicket.util.string.StringValue; import org.apache.wicket.validation.IValidator; import org.apache.wicket.validation.Validatable; import org.red5.logging.Red5LoggerFactory; @@ -109,9 +109,9 @@ public class Admin { options.addOption(new OmOption("i", "group", null, true, "The name of the default user group (mutually exclusive with 'file')")); options.addOption(new OmOption("i", "tz", null, true, "Default server time zone, and time zone for the selected user (mutually exclusive with 'file')")); options.addOption(new OmOption("i", null, "password", true, "Password of the default user, minimum " + USER_PASSWORD_MINIMUM_LENGTH + " characters (will be prompted if not set)", true)); - options.addOption(new OmOption("i", null, "system-email-address", true, "System e-mail address [default: " + cfg.mailReferer + "]", true)); - options.addOption(new OmOption("i", null, "smtp-server", true, "SMTP server for outgoing e-mails [default: " + cfg.smtpServer + "]", true)); - options.addOption(new OmOption("i", null, "smtp-port", true, "SMTP server for outgoing e-mails [default: " + cfg.smtpPort + "]", true)); + options.addOption(new OmOption("i", null, "system-email-address", true, String.format("System e-mail address [default: %s]", cfg.getMailReferer()), true)); + options.addOption(new OmOption("i", null, "smtp-server", true, String.format("SMTP server for outgoing e-mails [default: %s]", cfg.getSmtpServer()), true)); + options.addOption(new OmOption("i", null, "smtp-port", true, String.format("SMTP server for outgoing e-mails [default: %s]", cfg.getSmtpPort()), true)); options.addOption(new OmOption("i", null, "email-auth-user", true, "Email auth username (anonymous connection will be used if not set)", true)); options.addOption(new OmOption("i", null, "email-auth-pass", true, "Email auth password (anonymous connection will be used if not set)", true)); options.addOption(new OmOption("i", null, "email-use-tls", false, "Is secure e-mail connection [default: no]", true)); @@ -171,7 +171,7 @@ public class Admin { private WebApplicationContext getApplicationContext() { if (ctx == null) { - Long lngId = StringValue.valueOf(cfg.defaultLangId).toLong(1L); + Long lngId = (long)cfg.getDefaultLangId(); ctx = ApplicationHelper.getApplicationContext(lngId); SchedulerFactoryBean sfb = ctx.getBean(SchedulerFactoryBean.class); try { @@ -222,31 +222,31 @@ public class Admin { } boolean force = cmdl.hasOption("force"); if (cmdl.hasOption("skip-default-rooms")) { - cfg.createDefaultRooms = false; + cfg.setCreateDefaultRooms(false); } if (cmdl.hasOption("disable-frontend-register")) { - cfg.allowFrontendRegister = false; + cfg.setAllowFrontendRegister(false); } if (cmdl.hasOption("system-email-address")) { - cfg.mailReferer = cmdl.getOptionValue("system-email-address"); + cfg.setMailReferer(cmdl.getOptionValue("system-email-address")); } if (cmdl.hasOption("smtp-server")) { - cfg.smtpServer = cmdl.getOptionValue("smtp-server"); + cfg.setSmtpServer(cmdl.getOptionValue("smtp-server")); } if (cmdl.hasOption("smtp-port")) { - cfg.smtpPort = Integer.valueOf(cmdl.getOptionValue("smtp-port")); + cfg.setSmtpPort(Integer.valueOf(cmdl.getOptionValue("smtp-port"))); } if (cmdl.hasOption("email-auth-user")) { - cfg.mailAuthName = cmdl.getOptionValue("email-auth-user"); + cfg.setMailAuthName(cmdl.getOptionValue("email-auth-user")); } if (cmdl.hasOption("email-auth-pass")) { - cfg.mailAuthPass = cmdl.getOptionValue("email-auth-pass"); + cfg.setMailAuthPass(cmdl.getOptionValue("email-auth-pass")); } if (cmdl.hasOption("email-use-tls")) { - cfg.mailUseTls = true; + cfg.setMailUseTls(true); } if (cmdl.hasOption("default-language")) { - cfg.defaultLangId = cmdl.getOptionValue("default-language"); + cfg.setDefaultLangId(Integer.parseInt(cmdl.getOptionValue("default-language"))); } ConnectionProperties connectionProperties; File conf = OmFileHelper.getPersistence(); @@ -403,20 +403,20 @@ public class Admin { } private void checkAdminDetails() throws Exception { - cfg.username = cmdl.getOptionValue("user"); - cfg.email = cmdl.getOptionValue("email"); - cfg.group = cmdl.getOptionValue("group"); - if (cfg.username == null || cfg.username.length() < USER_LOGIN_MINIMUM_LENGTH) { + cfg.setUsername(cmdl.getOptionValue("user")); + cfg.setEmail(cmdl.getOptionValue("email")); + cfg.setGroup(cmdl.getOptionValue("group")); + if (cfg.getUsername() == null || cfg.getUsername().length() < USER_LOGIN_MINIMUM_LENGTH) { System.out.println("User login was not provided, or too short, should be at least " + USER_LOGIN_MINIMUM_LENGTH + " character long."); System.exit(1); } - if (!MailUtil.isValid(cfg.email)) { - System.out.println("Please provide non-empty valid email: '" + cfg.email + "' is not valid."); + if (!MailUtil.isValid(cfg.getEmail())) { + System.out.println(String.format("Please provide non-empty valid email: '%s' is not valid.", cfg.getEmail())); System.exit(1); } - if (cfg.group == null || cfg.group.length() < 1) { - System.out.println("User group was not provided, or too short, should be at least 1 character long: " + cfg.group); + if (Strings.isEmpty(cfg.getGroup())) { + System.out.println(String.format("User group was not provided, or too short, should be at least 1 character long: %s", cfg.getGroup())); System.exit(1); } if (cmdl.hasOption("password")) { @@ -429,17 +429,17 @@ public class Admin { passVal = new Validatable<>(cfg.getPassword()); passValidator.validate(passVal); if (!passVal.isValid()) { - System.out.print("Please enter password for the user '" + cfg.username + "':"); + System.out.print(String.format("Please enter password for the user '%s':", cfg.getUsername())); cfg.setPassword(new BufferedReader(new InputStreamReader(System.in, UTF_8)).readLine()); } } while (!passVal.isValid()); Map<String, String> tzMap = ImportHelper.getAllTimeZones(TimeZone.getAvailableIDs()); - cfg.ical_timeZone = null; + cfg.setTimeZone(null); if (cmdl.hasOption("tz")) { - cfg.ical_timeZone = cmdl.getOptionValue("tz"); - cfg.ical_timeZone = tzMap.containsKey(cfg.ical_timeZone) ? cfg.ical_timeZone : null; + String tz = cmdl.getOptionValue("tz"); + cfg.setTimeZone(tzMap.containsKey(tz) ? tz : null); } - if (cfg.ical_timeZone == null) { + if (cfg.getTimeZone() == null) { System.out.println("Please enter timezone, Possible timezones are:"); for (Map.Entry<String,String> me : tzMap.entrySet()) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java index cdc51b8..a65f64d 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java @@ -114,7 +114,6 @@ import org.apache.openmeetings.db.entity.user.Group; import org.apache.openmeetings.db.entity.user.GroupUser; import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.db.entity.user.User.Right; -import org.apache.wicket.util.string.StringValue; import org.red5.logging.Red5LoggerFactory; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -164,31 +163,31 @@ public class ImportInitvalues { */ public static List<Configuration> initialCfgs(InstallationConfig cfg) { List<Configuration> list = new ArrayList<>(); - addCfg(list, CONFIG_CRYPT, cfg.cryptClassName, Configuration.Type.string, + addCfg(list, CONFIG_CRYPT, cfg.getCryptClassName(), Configuration.Type.string, "This Class is used for Authentification-Crypting. " + "Be carefull what you do here! If you change it while " + "running previous Pass of users will not be workign anymore! " + "for more Information see http://openmeetings.apache.org/CustomCryptMechanism.html"; , "1.9.x"); - addCfg(list, CONFIG_REGISTER_FRONTEND, String.valueOf(cfg.allowFrontendRegister), Configuration.Type.bool + addCfg(list, CONFIG_REGISTER_FRONTEND, String.valueOf(cfg.isAllowFrontendRegister()), Configuration.Type.bool , "Is user register available on login screen", "1.8.x"); addCfg(list, CONFIG_REGISTER_SOAP, "true", Configuration.Type.bool, "Is user register available via SOAP/REST", "3.0.x"); addCfg(list, CONFIG_REGISTER_OAUTH, "true", Configuration.Type.bool, "Is user register available via OAuth", "3.0.x"); // this group_id is the Group of users who register through the frontend or SOAP addCfg(list, CONFIG_DEFAULT_GROUP_ID, "1", Configuration.Type.number, "", "1.8.x"); - addCfg(list, CONFIG_SMTP_SERVER, cfg.smtpServer, Configuration.Type.string, "this is the smtp server to send messages", "1.9.x"); + addCfg(list, CONFIG_SMTP_SERVER, cfg.getSmtpServer(), Configuration.Type.string, "this is the smtp server to send messages", "1.9.x"); - addCfg(list, CONFIG_SMTP_PORT, String.valueOf(cfg.smtpPort), Configuration.Type.number, "this is the smtp server port normally 25", "1.9.x"); + addCfg(list, CONFIG_SMTP_PORT, String.valueOf(cfg.getSmtpPort()), Configuration.Type.number, "this is the smtp server port normally 25", "1.9.x"); - addCfg(list, CONFIG_SMTP_SYSTEM_EMAIL, cfg.mailReferer, Configuration.Type.string, "all send e-mails by the system will have this address", "1.9.x"); + addCfg(list, CONFIG_SMTP_SYSTEM_EMAIL, cfg.getMailReferer(), Configuration.Type.string, "all send e-mails by the system will have this address", "1.9.x"); - addCfg(list, CONFIG_SMTP_USER, cfg.mailAuthName, Configuration.Type.string, "System auth email username", "1.9.x"); + addCfg(list, CONFIG_SMTP_USER, cfg.getMailAuthName(), Configuration.Type.string, "System auth email username", "1.9.x"); - addCfg(list, CONFIG_SMTP_PASS, cfg.mailAuthPass, Configuration.Type.string, "System auth email password", "1.9.x"); + addCfg(list, CONFIG_SMTP_PASS, cfg.getMailAuthPass(), Configuration.Type.string, "System auth email password", "1.9.x"); - addCfg(list, CONFIG_SMTP_TLS, String.valueOf(cfg.mailUseTls), Configuration.Type.bool, "Enable TLS", "1.9.x"); + addCfg(list, CONFIG_SMTP_TLS, String.valueOf(cfg.isMailUseTls()), Configuration.Type.bool, "Enable TLS", "1.9.x"); addCfg(list, CONFIG_SMTP_TIMEOUT_CON, "30000", Configuration.Type.number, "Socket connection timeout value in milliseconds. Default is 30 seconds (30000).", "1.9.x"); @@ -199,52 +198,52 @@ public class ImportInitvalues { addCfg(list, CONFIG_APPLICATION_NAME, DEFAULT_APP_NAME, Configuration.Type.string, "Name of the Browser Title window", "3.0.x"); // "1" == "EN" - addCfg(list, CONFIG_DEFAULT_LANG, cfg.defaultLangId, Configuration.Type.number, "Default System Language ID see languages.xml", "1.8.x"); + addCfg(list, CONFIG_DEFAULT_LANG, String.valueOf(cfg.getDefaultLangId()), Configuration.Type.number, "Default System Language ID see languages.xml", "1.8.x"); - addCfg(list, CONFIG_DOCUMENT_DPI, String.valueOf(cfg.docDpi), Configuration.Type.number, + addCfg(list, CONFIG_DOCUMENT_DPI, String.valueOf(cfg.getDocDpi()), Configuration.Type.number, "dpi for conversion of PDF to images (should be an integer between 50 and 600 with a default value of 150 dpi)", "2.0.x"); - addCfg(list, CONFIG_DOCUMENT_QUALITY, String.valueOf(cfg.docQuality), Configuration.Type.number, + addCfg(list, CONFIG_DOCUMENT_QUALITY, String.valueOf(cfg.getDocQuality()), Configuration.Type.number, "compression quality for conversion of PDF to images (should be an integer between 1 and 100, with a default value of 90)", "2.0.x"); - addCfg(list, CONFIG_PATH_IMAGEMAGIC, cfg.imageMagicPath, Configuration.Type.string, "Path to ImageMagick tools", "2.0.x"); + addCfg(list, CONFIG_PATH_IMAGEMAGIC, cfg.getImageMagicPath(), Configuration.Type.string, "Path to ImageMagick tools", "2.0.x"); - addCfg(list, CONFIG_PATH_SOX, cfg.soxPath, Configuration.Type.string, "Path To SoX-Tools", "2.0.x"); + addCfg(list, CONFIG_PATH_SOX, cfg.getSoxPath(), Configuration.Type.string, "Path To SoX-Tools", "2.0.x"); - addCfg(list, CONFIG_PATH_FFMPEG, cfg.ffmpegPath, Configuration.Type.string, "Path To FFMPEG", "2.0.x"); - addCfg(list, CONFIG_PATH_OFFICE, cfg.officePath, Configuration.Type.string, + addCfg(list, CONFIG_PATH_FFMPEG, cfg.getFfmpegPath(), Configuration.Type.string, "Path To FFMPEG", "2.0.x"); + addCfg(list, CONFIG_PATH_OFFICE, cfg.getOfficePath(), Configuration.Type.string, "The path to OpenOffice/LibreOffice (optional) please set this to the real path in case jodconverter is unable to find OpenOffice/LibreOffice installation automatically", "2.0.x"); - addCfg(list, CONFIG_DASHBOARD_RSS_FEED1, cfg.urlFeed, Configuration.Type.string, "Feed URL 1", "1.9.x"); + addCfg(list, CONFIG_DASHBOARD_RSS_FEED1, cfg.getUrlFeed(), Configuration.Type.string, "Feed URL 1", "1.9.x"); - addCfg(list, CONFIG_DASHBOARD_RSS_FEED2, cfg.urlFeed2, Configuration.Type.string, "Feed URL 2", "1.9.x"); + addCfg(list, CONFIG_DASHBOARD_RSS_FEED2, cfg.getUrlFeed2(), Configuration.Type.string, "Feed URL 2", "1.9.x"); - addCfg(list, CONFIG_EMAIL_AT_REGISTER, String.valueOf(cfg.sendEmailAtRegister), Configuration.Type.bool, + addCfg(list, CONFIG_EMAIL_AT_REGISTER, String.valueOf(cfg.isSendEmailAtRegister()), Configuration.Type.bool, "User get a EMail with their Account data.", "2.0.x"); - addCfg(list, CONFIG_EMAIL_VERIFICATION, cfg.sendEmailWithVerficationCode, Configuration.Type.bool, + addCfg(list, CONFIG_EMAIL_VERIFICATION, String.valueOf(cfg.isSendEmailWithVerficationCode()), Configuration.Type.bool, String.format("User must activate their account by clicking on the " + "activation-link in the registering Email " + "It makes no sense to make this(%s) 'true' while " + "%s is 'false' cause you need to send a EMail.", CONFIG_EMAIL_VERIFICATION, CONFIG_EMAIL_AT_REGISTER), "2.0.x"); - addCfg(list, CONFIG_APPLICATION_BASE_URL, cfg.baseUrl, Configuration.Type.string, "Base URL your OPenmeetings installation will be accessible at.", "3.0.2"); + addCfg(list, CONFIG_APPLICATION_BASE_URL, cfg.getBaseUrl(), Configuration.Type.string, "Base URL your OPenmeetings installation will be accessible at.", "3.0.2"); // *************************************** // *************************************** // SIP Integration Coniguration Values // *************************************** - addCfg(list, CONFIG_SIP_ENABLED, String.valueOf(cfg.sipEnable), Configuration.Type.bool, "Enable to enable the red5SIP integration ", "1.9.x"); - addCfg(list, CONFIG_SIP_ROOM_PREFIX, cfg.sipRoomPrefix, Configuration.Type.string, "Numerical prefix for OM rooms created inside the SIP", "1.9.x"); - addCfg(list, CONFIG_SIP_EXTEN_CONTEXT, cfg.sipExtenContext, Configuration.Type.string, "Enable to enable the red5SIP integration ", "1.9.x"); + addCfg(list, CONFIG_SIP_ENABLED, String.valueOf(cfg.isSipEnable()), Configuration.Type.bool, "Enable to enable the red5SIP integration ", "1.9.x"); + addCfg(list, CONFIG_SIP_ROOM_PREFIX, cfg.getSipRoomPrefix(), Configuration.Type.string, "Numerical prefix for OM rooms created inside the SIP", "1.9.x"); + addCfg(list, CONFIG_SIP_EXTEN_CONTEXT, cfg.getSipExtenContext(), Configuration.Type.string, "Enable to enable the red5SIP integration ", "1.9.x"); // *************************************** // *************************************** // Timezone settings // *************************************** - addCfg(list, CONFIG_DEFAULT_TIMEZONE, cfg.ical_timeZone, Configuration.Type.string, "This is the default timezone if nothing is specified", "1.9.x"); + addCfg(list, CONFIG_DEFAULT_TIMEZONE, cfg.getTimeZone(), Configuration.Type.string, "This is the default timezone if nothing is specified", "1.9.x"); // *************************************** // *************************************** @@ -291,7 +290,7 @@ public class ImportInitvalues { addCfg(list, CONFIG_DEFAULT_LDAP_ID, "0", Configuration.Type.number, "Ldap domain selected by default in the login screen", "1.9.x"); // set inviter's email address as ReplyTo in email invitations - addCfg(list, CONFIG_REPLY_TO_ORGANIZER, String.valueOf(cfg.replyToOrganizer), Configuration.Type.bool, + addCfg(list, CONFIG_REPLY_TO_ORGANIZER, String.valueOf(cfg.isReplyToOrganizer()), Configuration.Type.bool, "Set inviter's email address as ReplyTo in email invitations", "2.0.x"); addCfg(list, CONFIG_DEFAULT_LANDING_ZONE, "user/dashboard", Configuration.Type.string @@ -393,7 +392,7 @@ public class ImportInitvalues { public void loadInitUserAndGroup(InstallationConfig cfg) throws Exception { // Add default group Group org = new Group(); - org.setName(cfg.group); + org.setName(cfg.getGroup()); org.setInsertedby(1L); org.setDeleted(false); org.setInserted(new Date()); @@ -403,10 +402,10 @@ public class ImportInitvalues { u.setType(User.Type.user); u.getRights().add(Right.Admin); u.getRights().add(Right.Soap); - u.setLogin(cfg.username); + u.setLogin(cfg.getUsername()); u.setFirstname("firstname"); u.setLastname("lastname"); - u.getAddress().setEmail(cfg.email); + u.getAddress().setEmail(cfg.getEmail()); u.getGroupUsers().add(new GroupUser(org, u)); u = userDao.update(u, cfg.getPassword(), -1L); @@ -500,7 +499,7 @@ public class ImportInitvalues { loadInitUserAndGroup(cfg); progress = 80; - loadDefaultRooms(cfg.createDefaultRooms, StringValue.valueOf(cfg.defaultLangId).toLong(1L)); + loadDefaultRooms(cfg.isCreateDefaultRooms(), cfg.getDefaultLangId()); progress = 100; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java ---------------------------------------------------------------------- diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java index fe9f4c8..6269ae1 100644 --- a/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java +++ b/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java @@ -28,41 +28,41 @@ import org.apache.openmeetings.util.crypt.SCryptImplementation; public class InstallationConfig implements Serializable { private static final long serialVersionUID = 1L; - public String appName = DEFAULT_APP_NAME; - public String username; + private String appName = DEFAULT_APP_NAME; + private String username; private String password; - public String email; - public String group; - public boolean allowFrontendRegister = true; - public boolean createDefaultRooms = true; - public String ical_timeZone = "Europe/Berlin"; + private String email; + private String group; + private boolean allowFrontendRegister = true; + private boolean createDefaultRooms = true; + private String timeZone = "Europe/Berlin"; - public String cryptClassName = SCryptImplementation.class.getCanonicalName(); + private String cryptClassName = SCryptImplementation.class.getCanonicalName(); //email - public Integer smtpPort = 25; - public String smtpServer = "localhost"; - public String mailAuthName = ""; - public String mailAuthPass = ""; - public String mailReferer = "[email protected]"; - public boolean mailUseTls = false; + private Integer smtpPort = 25; + private String smtpServer = "localhost"; + private String mailAuthName = ""; + private String mailAuthPass = ""; + private String mailReferer = "[email protected]"; + private boolean mailUseTls = false; //paths - public Integer docDpi = 150; - public Integer docQuality = 90; - public String imageMagicPath = ""; - public String ffmpegPath = ""; - public String soxPath = ""; - public String officePath = ""; - - public String defaultLangId = "1"; - public boolean sendEmailAtRegister = false; - public String urlFeed = "http://mail-archives.apache.org/mod_mbox/openmeetings-user/?format=atom";; - public String urlFeed2 = "http://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";; - public String sendEmailWithVerficationCode = "false"; - public boolean sipEnable = false; - public String sipRoomPrefix = "400"; - public String sipExtenContext = "rooms"; - public boolean replyToOrganizer = true; - public String baseUrl = DEFAULT_BASE_URL; + private Integer docDpi = 150; + private Integer docQuality = 90; + private String imageMagicPath = ""; + private String ffmpegPath = ""; + private String soxPath = ""; + private String officePath = ""; + + private int defaultLangId = 1; + private boolean sendEmailAtRegister = false; + private String urlFeed = "http://mail-archives.apache.org/mod_mbox/openmeetings-user/?format=atom";; + private String urlFeed2 = "http://mail-archives.apache.org/mod_mbox/openmeetings-dev/?format=atom";; + private boolean sendEmailWithVerficationCode = false; + private boolean sipEnable = false; + private String sipRoomPrefix = "400"; + private String sipExtenContext = "rooms"; + private boolean replyToOrganizer = true; + private String baseUrl = DEFAULT_BASE_URL; public String getPassword() { return password; @@ -72,6 +72,246 @@ public class InstallationConfig implements Serializable { this.password = password; } + public String getAppName() { + return appName; + } + + public void setAppName(String appName) { + this.appName = appName; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getGroup() { + return group; + } + + public void setGroup(String group) { + this.group = group; + } + + public boolean isAllowFrontendRegister() { + return allowFrontendRegister; + } + + public void setAllowFrontendRegister(boolean allowFrontendRegister) { + this.allowFrontendRegister = allowFrontendRegister; + } + + public boolean isCreateDefaultRooms() { + return createDefaultRooms; + } + + public void setCreateDefaultRooms(boolean createDefaultRooms) { + this.createDefaultRooms = createDefaultRooms; + } + + public String getTimeZone() { + return timeZone; + } + + public void setTimeZone(String timeZone) { + this.timeZone = timeZone; + } + + public String getCryptClassName() { + return cryptClassName; + } + + public void setCryptClassName(String cryptClassName) { + this.cryptClassName = cryptClassName; + } + + public Integer getSmtpPort() { + return smtpPort; + } + + public void setSmtpPort(Integer smtpPort) { + this.smtpPort = smtpPort; + } + + public String getSmtpServer() { + return smtpServer; + } + + public void setSmtpServer(String smtpServer) { + this.smtpServer = smtpServer; + } + + public String getMailAuthName() { + return mailAuthName; + } + + public void setMailAuthName(String mailAuthName) { + this.mailAuthName = mailAuthName; + } + + public String getMailAuthPass() { + return mailAuthPass; + } + + public void setMailAuthPass(String mailAuthPass) { + this.mailAuthPass = mailAuthPass; + } + + public String getMailReferer() { + return mailReferer; + } + + public void setMailReferer(String mailReferer) { + this.mailReferer = mailReferer; + } + + public boolean isMailUseTls() { + return mailUseTls; + } + + public void setMailUseTls(boolean mailUseTls) { + this.mailUseTls = mailUseTls; + } + + public Integer getDocDpi() { + return docDpi; + } + + public void setDocDpi(Integer docDpi) { + this.docDpi = docDpi; + } + + public Integer getDocQuality() { + return docQuality; + } + + public void setDocQuality(Integer docQuality) { + this.docQuality = docQuality; + } + + public String getImageMagicPath() { + return imageMagicPath; + } + + public void setImageMagicPath(String imageMagicPath) { + this.imageMagicPath = imageMagicPath; + } + + public String getFfmpegPath() { + return ffmpegPath; + } + + public void setFfmpegPath(String ffmpegPath) { + this.ffmpegPath = ffmpegPath; + } + + public String getSoxPath() { + return soxPath; + } + + public void setSoxPath(String soxPath) { + this.soxPath = soxPath; + } + + public String getOfficePath() { + return officePath; + } + + public void setOfficePath(String officePath) { + this.officePath = officePath; + } + + public int getDefaultLangId() { + return defaultLangId; + } + + public void setDefaultLangId(int defaultLangId) { + this.defaultLangId = defaultLangId; + } + + public boolean isSendEmailAtRegister() { + return sendEmailAtRegister; + } + + public void setSendEmailAtRegister(boolean sendEmailAtRegister) { + this.sendEmailAtRegister = sendEmailAtRegister; + } + + public String getUrlFeed() { + return urlFeed; + } + + public void setUrlFeed(String urlFeed) { + this.urlFeed = urlFeed; + } + + public String getUrlFeed2() { + return urlFeed2; + } + + public void setUrlFeed2(String urlFeed2) { + this.urlFeed2 = urlFeed2; + } + + public boolean isSendEmailWithVerficationCode() { + return sendEmailWithVerficationCode; + } + + public void setSendEmailWithVerficationCode(boolean sendEmailWithVerficationCode) { + this.sendEmailWithVerficationCode = sendEmailWithVerficationCode; + } + + public boolean isSipEnable() { + return sipEnable; + } + + public void setSipEnable(boolean sipEnable) { + this.sipEnable = sipEnable; + } + + public String getSipRoomPrefix() { + return sipRoomPrefix; + } + + public void setSipRoomPrefix(String sipRoomPrefix) { + this.sipRoomPrefix = sipRoomPrefix; + } + + public String getSipExtenContext() { + return sipExtenContext; + } + + public void setSipExtenContext(String sipExtenContext) { + this.sipExtenContext = sipExtenContext; + } + + public boolean isReplyToOrganizer() { + return replyToOrganizer; + } + + public void setReplyToOrganizer(boolean replyToOrganizer) { + this.replyToOrganizer = replyToOrganizer; + } + + public String getBaseUrl() { + return baseUrl; + } + + public void setBaseUrl(String baseUrl) { + this.baseUrl = baseUrl; + } + @Override public String toString() { return "InstallationConfig [allowFrontendRegister=" @@ -91,7 +331,7 @@ public class InstallationConfig implements Serializable { + sipEnable + ", sipRoomPrefix=" + sipRoomPrefix + ", sipExtenContext=" + sipExtenContext + ", replyToOrganizer=" + replyToOrganizer - + ", ical_timeZone=" + ical_timeZone + + ", timeZone=" + timeZone + "]"; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java index 93fbe87..4b1dc21 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BaseNotInitedPage.java @@ -31,7 +31,7 @@ public abstract class BaseNotInitedPage extends BasePage { @Override protected String getApplicationName() { - return installCfg.appName; + return installCfg.getAppName(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html index c6f4dcd..f120225 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html @@ -32,8 +32,8 @@ <li><label wicket:for="email"><wicket:message key="install.wizard.params.step1.email"/></label> <input wicket:id="email" wicket:message="title:install.wizard.params.step1.email.title" type="text" /> </li> - <li><label wicket:for="ical_timeZone"><wicket:message key="install.wizard.params.step1.tz"/></label> - <select wicket:id="ical_timeZone"></select> + <li><label wicket:for="timeZone"><wicket:message key="install.wizard.params.step1.tz"/></label> + <select wicket:id="timeZone"></select> </li> </ul> </fieldset> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java index c2ffebb..84fe1d4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java @@ -117,7 +117,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { //onInit, applyState public InstallWizard(String id, String title) { super(id, title, new CompoundPropertyModel<>(new InstallationConfig()), true); - setTitle(Model.of(getModelObject().appName)); + setTitle(Model.of(getModelObject().getAppName())); welcomeStep = new WelcomeStep(); dbStep = new DbStep(); paramsStep1 = new ParamsStep1(); @@ -180,7 +180,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { @Override protected void onInitialize() { super.onInitialize(); - InstallWizard.this.setTitle(Model.of(getModelObject().appName + " - " + getString("install.wizard.install.header"))); + InstallWizard.this.setTitle(Model.of(getModelObject().getAppName() + " - " + getString("install.wizard.install.header"))); } } @@ -395,7 +395,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { @Override protected void onInitialize() { super.onInitialize(); - add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().appName, getString("install.wizard.db.step.instructions.derby") + add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().getAppName(), getString("install.wizard.db.step.instructions.derby") , getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql") , getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql") , getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false)); @@ -418,7 +418,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { public ParamsStep1() { super(dbStep); - add(tzDropDown = new TzDropDown("ical_timeZone")); + add(tzDropDown = new TzDropDown("timeZone")); } @Override @@ -847,7 +847,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> { option = op; } list.add(op); - if (option == null && me.getKey().toString().equals(InstallWizard.this.getModelObject().defaultLangId)) { + if (option == null && me.getKey().toString().equals(InstallWizard.this.getModelObject().getDefaultLangId())) { option = op; } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java index a0f2120..218b68a 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/AbstractJUnitDefaults.java @@ -45,9 +45,9 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest { protected static final String username = "admin"; protected static final String userpass = "12345"; - private static final String orgname = "smoketest"; + private static final String group = "smoketest"; private static final String timeZone = "Europe/Berlin"; - private static final String useremail = "[email protected]"; + private static final String email = "[email protected]"; @Autowired private AppointmentDao appointmentDao; @@ -170,11 +170,11 @@ public abstract class AbstractJUnitDefaults extends AbstractSpringTest { private void makeDefaultScheme() throws Exception { InstallationConfig cfg = new InstallationConfig(); - cfg.username = username; + cfg.setUsername(username); cfg.setPassword(userpass); - cfg.email = useremail; - cfg.group = orgname; - cfg.ical_timeZone = timeZone; + cfg.setEmail(email); + cfg.setGroup(group); + cfg.setTimeZone(timeZone); importInitvalues.loadAll(cfg, false); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java index e560b33..60dd0ec 100644 --- a/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java +++ b/openmeetings-web/src/test/java/org/apache/openmeetings/test/webservice/TestRoomService.java @@ -68,11 +68,11 @@ public class TestRoomService extends AbstractWebServiceTest { assertEquals("Same Room should be returned", room.getId(), room1.getId()); } - private CallResult<RoomDTO> createAndValidate(RoomDTO r) { + private static CallResult<RoomDTO> createAndValidate(RoomDTO r) { return createAndValidate(null, r); } - private CallResult<RoomDTO> createAndValidate(String sid, RoomDTO r) { + private static CallResult<RoomDTO> createAndValidate(String sid, RoomDTO r) { if (sid == null) { ServiceResult sr = login(); sid = sr.getMessage(); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0bec7852/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java ---------------------------------------------------------------------- diff --git a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java index 1906785..42146f2 100644 --- a/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java +++ b/openmeetings-webservice/src/main/java/org/apache/openmeetings/webservice/RoomWebService.java @@ -132,7 +132,7 @@ public class RoomWebService extends BaseWebService { * This method is required to set additional fields on room sub-objects * for ex: RoomFile.roomId */ - private Room updateRtoRoom(Room r, Long userId) { + private static Room updateRtoRoom(Room r, Long userId) { if (r.getFiles() == null) { r.setFiles(new ArrayList<>()); }
