You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/10/06 10:11:06 UTC
[1/2] openmeetings git commit: [OPENMEETINGS-1717] code is simplified
for easier checking
Repository: openmeetings
Updated Branches:
refs/heads/master df895e041 -> 8accd70c3
[OPENMEETINGS-1717] code is simplified for easier checking
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/efc1d2b8
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/efc1d2b8
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/efc1d2b8
Branch: refs/heads/master
Commit: efc1d2b8149b9452886574b9a08e12763e694655
Parents: df895e0
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 6 17:10:27 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 6 17:10:27 2017 +0700
----------------------------------------------------------------------
.../web/pages/auth/SignInDialog.java | 28 +++++++++-----------
.../openmeetings/web/pages/auth/SignInPage.java | 20 ++++++++------
2 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/efc1d2b8/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 4615c77..f19cb72 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -24,6 +24,8 @@ import static org.apache.openmeetings.web.app.Application.getAuthenticationStrat
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowOAuthLogin;
import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister;
+import static org.apache.openmeetings.web.pages.auth.SignInPage.getRedirectUri;
+import static org.apache.openmeetings.web.pages.auth.SignInPage.prepareUrlParams;
import static org.apache.openmeetings.web.room.SwfPanel.SWF;
import static org.apache.openmeetings.web.room.SwfPanel.SWF_TYPE_NETWORK;
@@ -63,9 +65,9 @@ import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.Strings;
import org.red5.logging.Red5LoggerFactory;
@@ -274,27 +276,21 @@ public class SignInDialog extends NonClosableDialog<String> {
@Override
protected void populateItem(final ListItem<OAuthServer> item) {
Button btn = new Button("oauthBtn");
- Image icon = new Image("icon", new Model<String>());
- icon.setVisible(!Strings.isEmpty(item.getModelObject().getIconUrl()));
- icon.add(new AttributeModifier("src", new IModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return item.getModelObject().getIconUrl();
- }
-
- }));
+ final OAuthServer s = item.getModelObject();
+ Image icon = new Image("icon", Model.of(""));
+ icon.setVisible(!Strings.isEmpty(s.getIconUrl()));
+ icon.add(AttributeModifier.replace("src", s.getIconUrl()));
btn.add(icon);
- btn.add(new Label("label", item.getModelObject().getName()))
+ btn.add(new Label("label", s.getName()))
.add(new AjaxEventBehavior("click") {
private static final long serialVersionUID = 1L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- PageParameters parameters = new PageParameters();
- parameters.add("oauthid", item.getModelObject().getId());
- setResponsePage(SignInPage.class, parameters);
+ String authUrl = prepareUrlParams(s.getRequestKeyUrl(), s.getClientId(),
+ null, null, getRedirectUri(s, SignInDialog.this), null);
+ log.debug("redirectUrl={}", authUrl);
+ throw new RedirectToUrlException(authUrl);
}
});
item.add(btn);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/efc1d2b8/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index e22d969..bb92def 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -87,24 +87,24 @@ public class SignInPage extends BaseInitedPage {
OAuthServer server = getBean(OAuth2Dao.class).get(serverId);
log.debug("OAuthServer=" + server);
if (server == null) {
- log.warn("OAuth server id=" + serverId + " not found");
+ log.warn("OAuth server id={} not found", serverId);
return;
}
- if (p.get("code").toString() != null) { // got code
+ if (!p.get("code").isNull()) { // got code
String code = p.get("code").toString();
- log.debug("OAuth response code=" + code);
+ log.debug("OAuth response code={}", code);
AuthInfo authInfo = getToken(code, server);
if (authInfo == null) {
return;
}
- log.debug("OAuthInfo=" + authInfo);
+ log.debug("OAuthInfo={}", authInfo);
Map<String, String> authParams = getAuthParams(authInfo.accessToken, code, server);
loginViaOAuth2(authParams, serverId);
} else { // redirect to get code
String redirectUrl = prepareUrlParams(server.getRequestKeyUrl(), server.getClientId(),
null, null, getRedirectUri(server, this), null);
- log.debug("redirectUrl=" + redirectUrl);
+ log.debug("redirectUrl={}", redirectUrl);
throw new RedirectToUrlException(redirectUrl);
}
} catch (IOException|NoSuchAlgorithmException e) {
@@ -153,8 +153,8 @@ public class SignInPage extends BaseInitedPage {
// ============= OAuth2 methods =============
- public String prepareUrlParams(String urlTemplate, String clientId, String clientSecret,
- String clientToken, String redirectUri, String code) throws UnsupportedEncodingException {
+ public static String prepareUrlParams(String urlTemplate, String clientId, String clientSecret,
+ String clientToken, String redirectUri, String code) {
String result = urlTemplate;
if (clientId != null) {
result = result.replace("{$client_id}", clientId);
@@ -166,7 +166,11 @@ public class SignInPage extends BaseInitedPage {
result = result.replace("{$access_token}", clientToken);
}
if (redirectUri != null) {
- result = result.replace("{$redirect_uri}", URLEncoder.encode(redirectUri, UTF_8.name()));
+ try {
+ result = result.replace("{$redirect_uri}", URLEncoder.encode(redirectUri, UTF_8.name()));
+ } catch (UnsupportedEncodingException e) {
+ log.error("Unexpected exception while encoding URI", e);
+ }
}
if (code != null) {
result = result.replace("{$code}", code);
[2/2] openmeetings git commit: [OPENMEETINGS-1714] coverage is
improved
Posted by so...@apache.org.
[OPENMEETINGS-1714] coverage is improved
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8accd70c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8accd70c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8accd70c
Branch: refs/heads/master
Commit: 8accd70c32128e3e78aad14a7888b5af985beff6
Parents: efc1d2b
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Fri Oct 6 17:10:55 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Fri Oct 6 17:10:55 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/cli/Admin.java | 103 ++++++++++---------
.../apache/openmeetings/cli/ExitException.java | 36 +++++++
.../installation/ImportInitvalues.java | 6 +-
.../installation/InstallationConfig.java | 14 +--
.../src/site/xdoc/CommandLineAdmin.xml | 3 +-
.../web/app/Application.properties.xml | 2 +-
.../web/app/Application_ar.properties.xml | 2 +-
.../web/app/Application_bg.properties.xml | 2 +-
.../web/app/Application_ca.properties.xml | 2 +-
.../web/app/Application_cs.properties.xml | 2 +-
.../web/app/Application_da.properties.xml | 2 +-
.../web/app/Application_de.properties.xml | 2 +-
.../web/app/Application_el.properties.xml | 2 +-
.../web/app/Application_es.properties.xml | 2 +-
.../web/app/Application_fa.properties.xml | 2 +-
.../web/app/Application_fi.properties.xml | 2 +-
.../web/app/Application_fr.properties.xml | 2 +-
.../web/app/Application_gl.properties.xml | 2 +-
.../web/app/Application_hu.properties.xml | 2 +-
.../web/app/Application_id.properties.xml | 2 +-
.../web/app/Application_it.properties.xml | 2 +-
.../web/app/Application_ja.properties.xml | 2 +-
.../web/app/Application_ko.properties.xml | 2 +-
.../web/app/Application_nl.properties.xml | 2 +-
.../web/app/Application_pl.properties.xml | 2 +-
.../web/app/Application_pt.properties.xml | 2 +-
.../web/app/Application_pt_BR.properties.xml | 2 +-
.../web/app/Application_ru.properties.xml | 2 +-
.../web/app/Application_sk.properties.xml | 2 +-
.../web/app/Application_sv.properties.xml | 2 +-
.../web/app/Application_th.properties.xml | 2 +-
.../web/app/Application_tr.properties.xml | 2 +-
.../web/app/Application_uk.properties.xml | 2 +-
.../web/app/Application_zh_CN.properties.xml | 2 +-
.../web/app/Application_zh_TW.properties.xml | 2 +-
.../apache/openmeetings/web/pages/BasePage.java | 6 +-
.../install/InstallWizard$ParamsStep2.html | 6 +-
.../web/pages/install/InstallWizard.java | 4 +-
.../web/room/activities/ActivitiesPanel.java | 9 +-
.../web/room/menu/RoomMenuPanel.java | 3 +-
.../web/room/menu/StartSharingButton.java | 4 +-
.../web/room/sidebar/RoomClientPanel.java | 2 +-
.../openmeetings/web/room/wb/WbPanel.java | 4 +-
.../web/user/calendar/CalendarDialog.java | 19 +---
.../web/user/rooms/RoomsTabbedPanel.java | 2 +-
.../org/apache/openmeetings/cli/TestAdmin.java | 36 +++++++
46 files changed, 192 insertions(+), 125 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/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 616e190..1d9493d 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
@@ -82,6 +82,7 @@ public class Admin {
private Options opts = null;
private CommandLine cmdl = null;
private WebApplicationContext context = null;
+ private String step;
private Admin() {
cfg = new InstallationConfig();
@@ -116,7 +117,7 @@ public class Admin {
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));
- options.addOption(new OmOption("i", null, "skip-default-rooms", false, "Do not create default rooms [created by default]", true));
+ options.addOption(new OmOption("i", null, "skip-default-objects", false, "Do not create default rooms and OAuth servers [created by default]", true));
options.addOption(new OmOption("i", null, "disable-frontend-register", false, "Do not allow front end register [allowed by default]", true));
options.addOption(new OmOption("i", null, "default-language", true, "Default system language as int [1 by default]", true));
@@ -154,37 +155,41 @@ public class Admin {
"\t./admin.sh -i -v -user admin -email someemail@gmail.com -tz \"Asia/Tehran\" -group \"yourgroup\" --db-type mysql --db-host localhost");
}
- private void handleError(String msg, Exception e) {
- handleError(msg, e, false);
+ private void handleError(Exception e) {
+ handleError(e, false);
}
- private void handleError(String msg, Exception e, boolean printUsage) {
+ private void handleError(Exception e, boolean printUsage) {
if (printUsage) {
usage();
}
if (verbose) {
+ String msg = String.format("%s failed", step);
log.error(msg, e);
} else {
- log.error(msg + " " + e.getMessage());
+ log.error("{} failed: {}", step, e.getMessage());
}
- System.exit(1);
+ throw new ExitException();
}
private WebApplicationContext getApplicationContext() {
if (context == null) {
+ String _step = step; //preserve step
+ step = "Shutdown schedulers";
Long lngId = (long)cfg.getDefaultLangId();
context = ApplicationHelper.getApplicationContext(lngId);
SchedulerFactoryBean sfb = context.getBean(SchedulerFactoryBean.class);
try {
sfb.getScheduler().shutdown(false);
+ step = _step; //restore
} catch (Exception e) {
- handleError("Unable to shutdown schedulers", e);
+ handleError(e);
}
}
return context;
}
- private void process(String[] args) {
+ private void process(String... args) throws Exception {
String ctxName = System.getProperty("context", DEFAULT_CONTEXT_NAME);
setWicketApplicationName(ctxName);
File home = new File(System.getenv("RED5_HOME"));
@@ -196,7 +201,7 @@ public class Admin {
} catch (ParseException e) {
System.out.println(e.getMessage());
usage();
- System.exit(1);
+ throw new ExitException();
}
verbose = cmdl.hasOption('v');
@@ -216,14 +221,15 @@ public class Admin {
String file = cmdl.getOptionValue("file", "");
switch(cmd) {
case install:
- try {
+ {
+ step = "Install";
if (cmdl.hasOption("file") && (cmdl.hasOption("user") || cmdl.hasOption("email") || cmdl.hasOption("group"))) {
System.out.println("Please specify even 'file' option or 'admin user'.");
- System.exit(1);
+ throw new ExitException();
}
boolean force = cmdl.hasOption("force");
- if (cmdl.hasOption("skip-default-rooms")) {
- cfg.setCreateDefaultRooms(false);
+ if (cmdl.hasOption("skip-default-objects")) {
+ cfg.setCreateDefaultObjects(false);
}
if (cmdl.hasOption("disable-frontend-register")) {
cfg.setAllowFrontendRegister(false);
@@ -278,12 +284,11 @@ public class Admin {
ImportInitvalues importInit = getApplicationContext().getBean(ImportInitvalues.class);
importInit.loadAll(cfg, force);
}
- } catch(Exception e) {
- handleError("Install failed", e);
}
break;
case backup:
- try {
+ {
+ step = "Backup";
File f;
if (!cmdl.hasOption("file")) {
file = "backup_" + CalendarPatterns.getTimeForStreamId(new Date()) + ".zip";
@@ -300,19 +305,15 @@ public class Admin {
export.performExport(f, includeFiles, new ProgressHolder());
FileUtils.deleteDirectory(backup_dir);
backup_dir.delete();
- } catch (Exception e) {
- handleError("Backup failed", e);
}
break;
case restore:
- try {
- restoreOm(checkRestoreFile(file));
- } catch (Exception e) {
- handleError("Restore failed", e);
- }
+ step = "Restore";
+ restoreOm(checkRestoreFile(file));
break;
case files:
- try {
+ {
+ step = "Files";
boolean cleanup = cmdl.hasOption("cleanup");
if (cleanup) {
System.out.println("WARNING: all intermediate files will be clean up!");
@@ -321,20 +322,17 @@ public class Admin {
reportUploads(report, cleanup);
reportStreams(report, cleanup);
System.out.println(report);
- } catch (Exception e) {
- handleError("Files failed", e);
}
break;
case ldap:
- if (!cmdl.hasOption("d")) {
- System.out.println("Please specify LDAP domain Id.");
- System.exit(1);
- }
- Long domainId = Long.valueOf(cmdl.getOptionValue('d'));
- try {
+ {
+ step = "LDAP import";
+ if (!cmdl.hasOption("d")) {
+ System.out.println("Please specify LDAP domain Id.");
+ throw new ExitException();
+ }
+ Long domainId = Long.valueOf(cmdl.getOptionValue('d'));
getApplicationContext().getBean(LdapLoginManagement.class).importUsers(domainId, cmdl.hasOption("print-only"));
- } catch (Exception e) {
- handleError("LDAP import failed", e);
}
break;
case usage:
@@ -342,9 +340,6 @@ public class Admin {
usage();
break;
}
-
- System.out.println("... Done");
- System.exit(0);
}
private void reportUploads(StringBuilder report, boolean cleanup) throws IOException {
@@ -411,16 +406,16 @@ public class Admin {
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);
+ throw new ExitException();
}
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);
+ throw new ExitException();
}
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);
+ throw new ExitException();
}
if (cmdl.hasOption("password")) {
cfg.setPassword(cmdl.getOptionValue("password"));
@@ -448,7 +443,7 @@ public class Admin {
for (Map.Entry<String,String> me : tzMap.entrySet()) {
System.out.println(String.format("%1$-25s%2$s", "\"" + me.getKey() + "\"", me.getValue()));
}
- System.exit(1);
+ throw new ExitException();
}
}
@@ -506,22 +501,38 @@ public class Admin {
if (!cmdl.hasOption("file") || !backup.exists() || !backup.isFile()) {
System.out.println("File should be specified, and point the existent zip file");
usage();
- System.exit(1);
+ throw new ExitException();
}
-
return backup;
}
- private void restoreOm(File backup) {
+ private void restoreOm(File backup) throws Exception {
try (InputStream is = new FileInputStream(backup)) {
BackupImport importCtrl = getApplicationContext().getBean(BackupImport.class);
importCtrl.performImport(is);
+ }
+ }
+
+ //package private wrapper for testing
+ static void handle(String... args) {
+ Admin a = new Admin();
+ try {
+ a.process(args);
+ } catch (ExitException ee) {
+ throw ee;
} catch (Exception e) {
- handleError("Restore failed", e);
+ a.handleError(e);
}
}
public static void main(String[] args) {
- new Admin().process(args);
+ try {
+ handle(args);
+
+ System.out.println("... Done");
+ System.exit(0);
+ } catch (ExitException e) {
+ System.exit(e.getCode());
+ }
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ExitException.java
----------------------------------------------------------------------
diff --git a/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ExitException.java b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ExitException.java
new file mode 100644
index 0000000..cff6e11
--- /dev/null
+++ b/openmeetings-install/src/main/java/org/apache/openmeetings/cli/ExitException.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.cli;
+
+public class ExitException extends RuntimeException {
+ private static final long serialVersionUID = 1L;
+ private final int code;
+
+ public ExitException() {
+ this(1);
+ }
+
+ public ExitException(int code) {
+ this.code = code;
+ }
+
+ public int getCode() {
+ return code;
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/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 22b03b9..51811e2 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
@@ -485,7 +485,9 @@ public class ImportInitvalues {
progress = 20;
loadConfiguration(cfg);
progress = 40;
- loadInitialOAuthServers();
+ if (cfg.isCreateDefaultObjects()) {
+ loadInitialOAuthServers();
+ }
progress = 60;
}
@@ -499,7 +501,7 @@ public class ImportInitvalues {
loadInitUserAndGroup(cfg);
progress = 80;
- loadDefaultRooms(cfg.isCreateDefaultRooms(), cfg.getDefaultLangId());
+ loadDefaultRooms(cfg.isCreateDefaultObjects(), cfg.getDefaultLangId());
progress = 100;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/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 6269ae1..34346fa 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
@@ -34,7 +34,7 @@ public class InstallationConfig implements Serializable {
private String email;
private String group;
private boolean allowFrontendRegister = true;
- private boolean createDefaultRooms = true;
+ private boolean createDefaultObjects = true;
private String timeZone = "Europe/Berlin";
private String cryptClassName = SCryptImplementation.class.getCanonicalName();
@@ -112,12 +112,12 @@ public class InstallationConfig implements Serializable {
this.allowFrontendRegister = allowFrontendRegister;
}
- public boolean isCreateDefaultRooms() {
- return createDefaultRooms;
+ public boolean isCreateDefaultObjects() {
+ return createDefaultObjects;
}
- public void setCreateDefaultRooms(boolean createDefaultRooms) {
- this.createDefaultRooms = createDefaultRooms;
+ public void setCreateDefaultObjects(boolean createDefaultObjects) {
+ this.createDefaultObjects = createDefaultObjects;
}
public String getTimeZone() {
@@ -315,8 +315,8 @@ public class InstallationConfig implements Serializable {
@Override
public String toString() {
return "InstallationConfig [allowFrontendRegister="
- + allowFrontendRegister + ", createDefaultRooms="
- + createDefaultRooms + ", cryptClassName=" + cryptClassName
+ + allowFrontendRegister + ", createDefaultObjects="
+ + createDefaultObjects + ", cryptClassName=" + cryptClassName
+ ", smtpPort=" + smtpPort + ", smtpServer=" + smtpServer
+ ", mailAuthName=" + mailAuthName + ", mailAuthPass="
+ mailAuthPass + ", mailReferer=" + mailReferer
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
index b11fe15..b454814 100644
--- a/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
+++ b/openmeetings-server/src/site/xdoc/CommandLineAdmin.xml
@@ -78,7 +78,8 @@
--email-auth-pass <arg> (optional) Email auth password (anonymous connection will be
used if not set)
--email-use-tls (optional) Is secure e-mail connection [default: no]
- --skip-default-rooms (optional) Do not create default rooms [created by default]
+ --skip-default-objects (optional) Do not create default rooms and OAuth servers
+ [created by default]
--disable-frontend-register (optional) Do not allow front end register [allowed by default]
--db-type <arg> (optional) The type of the DB to be used
--db-host <arg> (optional) DNS name or IP address of database
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index c7817b2..8d8a524 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 51d806c..d5376c9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 067e2d5..c5efb70 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index b8577e7..33fd0d7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 8d4766d..58698cf 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 4f95409..0fef82c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 479dd95..13bae5d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Geben Sie einen Nutzernamen ein]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Neuen Nutzern erlauben, sich zu registrieren]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Konfiguration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Beispielräume aller Raumtypen erstellen]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Voreingestellte Sprache]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Nutzername]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index a952ff9..47affae 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index b445f1c..a24990c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Introduzca un nombre de usuario]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Permitir auto-registro]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuración]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Salas Preconfiguradas de todo tipo serán creadas]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Idioma preferido]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[Nombre de Usuario de correo SMTP]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Introduzca nombre usuario de correo]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index e444598..cf00e08 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 48b9a94..fc268f6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 583a217..8c21d53 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -801,7 +801,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Entrez un nom d'utilisateur]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Autoriser les nouveaux utilisateurs de s'enregistrer]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Installer toutes les salles par défaut]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Langue par défaut]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[Nom d'utilisateur système SMTP]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Entrez le nom d'utilisateur du courriel du système]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 341e912..26c9550 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index d467155..b7b90fe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -801,7 +801,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Adja meg a felhasználói nevét]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Előregisztráció engedélyezése (megjelenik a belépő panelen)]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Beállítások]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Alapértelmezett típusú konferencia szobák létrehozása]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Alapértelmezett nyelv]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Felhasználó név]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Adja meg a felhasználó nevet]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 6981ca8..4804b88 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index d13507b..046d1ac 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Specifica un nome utente]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Permetti auto-registrazione]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configurazione]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Le stanze predefinite di tutti i tipi verranno create]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Lingua predefinita]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[Nome utente SMTP]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Specifica il nome utente per mail]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 2bef2dc..a44aafb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index c8b3e66..b0ca7a1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 0c9fd1a..1cd0073 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 7be1af3..72dfbcc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index c68d390..4698004 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index c9a50b0..a6da06e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index becf042..e9b87b3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Введите логин пользователя]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Разрешить саморегистрацию]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Конфигурация]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[По умолчанию создать комнаты всех типов]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Будут созданы объекты БД всех типов (включая Комнаты, Сервера OAuth2 и т.д.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Язык по умолчанию]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Пользователь]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Введите логин для электронной почты]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 2d7832d..a8a625d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index 98c4e7e..3c6a1f1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index bce4c18..dcc4207 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index e8bc2f5..f0e5638 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 23a0eaa..d0b96fe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Введіть логін користувача]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Дозволити самореєстрацію]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Налаштування]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[За замовчуванням створити кімнати всіх типів]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Мову за замовчуванням]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Користувач]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Введіть логін для електронної пошти]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 1a1dd11..d03153e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -799,7 +799,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[输入用户名]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[允许自我注册]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[配置]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[创建所有类型的默认房间]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[默认语言]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-用户名]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[输入邮件用户名]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 60db5ec..e42617e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -802,7 +802,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="install.wizard.params.step1.username.title"><![CDATA[Enter a username]]></entry>
<entry key="install.wizard.params.step2.allowFrontendRegister"><![CDATA[Allow self-registering]]></entry>
<entry key="install.wizard.params.step2.configuration"><![CDATA[Configuration]]></entry>
- <entry key="install.wizard.params.step2.createDefaultRooms"><![CDATA[Default Rooms of all types will be created]]></entry>
+ <entry key="install.wizard.params.step2.createDefaultObjects"><![CDATA[Default DB objects of all types will be created (including Rooms, OAuth2 servers etc.)]]></entry>
<entry key="install.wizard.params.step2.defaultLangId"><![CDATA[Default Language]]></entry>
<entry key="install.wizard.params.step2.mailAuthName"><![CDATA[SMTP-Username]]></entry>
<entry key="install.wizard.params.step2.mailAuthName.title"><![CDATA[Enter the mail-username]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
index 1990470..b5bd5ad 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.java
@@ -59,9 +59,9 @@ public abstract class BasePage extends AsyncUrlFragmentAwarePage {
String code = getLanguageCode();
add(new TransparentWebMarkupContainer("html")
- .add(new AttributeModifier("xml:lang", code))
- .add(new AttributeModifier("lang", code))
- .add(new AttributeModifier("dir", isRtl() ? "rtl" : "ltr")));
+ .add(AttributeModifier.replace("xml:lang", code))
+ .add(AttributeModifier.replace("lang", code))
+ .add(AttributeModifier.replace("dir", isRtl() ? "rtl" : "ltr")));
add(new Label("pageTitle", appName));
add(header = new HeaderPanel("header", appName));
add(loader.setVisible(isMainPage()).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
index ef65904..25a3d72 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
@@ -59,10 +59,10 @@
</label>
</div>
</li>
- <li><label wicket:for="createDefaultRooms"><wicket:message key="install.wizard.params.step2.createDefaultRooms"/></label>
+ <li><label wicket:for="createDefaultObjects"><wicket:message key="install.wizard.params.step2.createDefaultObjects"/></label>
<div class="onoffswitch">
- <input type="checkbox" class="onoffswitch-checkbox" wicket:id="createDefaultRooms">
- <label class="onoffswitch-label" wicket:for="createDefaultRooms">
+ <input type="checkbox" class="onoffswitch-checkbox" wicket:id="createDefaultObjects">
+ <label class="onoffswitch-label" wicket:for="createDefaultObjects">
<span class="onoffswitch-inner">
<span class="before"></span>
<span class="after"></span>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/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 b1ea41c..ad8e21c 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
@@ -49,8 +49,8 @@ import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.util.ConnectionProperties;
import org.apache.openmeetings.util.ConnectionProperties.DbType;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.util.process.ProcessResult;
import org.apache.openmeetings.util.process.ProcessHelper;
+import org.apache.openmeetings.util.process.ProcessResult;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ErrorMessagePanel;
@@ -457,7 +457,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
add(new CheckBox("allowFrontendRegister"));
add(new CheckBox("sendEmailAtRegister"));
add(new CheckBox("sendEmailWithVerficationCode"));
- add(new CheckBox("createDefaultRooms"));
+ add(new CheckBox("createDefaultObjects"));
add(new TextField<String>("mailReferer"));
add(new TextField<String>("smtpServer"));
add(new TextField<Integer>("smtpPort").setRequired(true));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
index edaed8a..2a0bf78 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.java
@@ -45,7 +45,6 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
@@ -160,9 +159,9 @@ public class ActivitiesPanel extends Panel {
Activity a = item.getModelObject();
String text = "";
Long roomId = room.getRoom().getId();
- Component accept = new WebMarkupContainer("accept").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.accept.name(), a.getId())));
- Component decline = new WebMarkupContainer("decline").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.decline.name(), a.getId())));
- Component find = new WebMarkupContainer("find").add(new AttributeAppender("onclick", String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false);
+ Component accept = new WebMarkupContainer("accept").add(AttributeModifier.append("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.accept.name(), a.getId())));
+ Component decline = new WebMarkupContainer("decline").add(AttributeModifier.append("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.decline.name(), a.getId())));
+ Component find = new WebMarkupContainer("find").add(AttributeModifier.append("onclick", String.format("Activities.findUser('%s');", a.getUid()))).setVisible(false);
boolean self = getUserId().equals(a.getSender());
switch (a.getType()) {
case reqRightModerator:
@@ -231,7 +230,7 @@ public class ActivitiesPanel extends Panel {
text = String.format("%s %s [%s]", name, getString("693"), df.format(a.getCreated()));
break;
}
- item.add(new WebMarkupContainer("close").add(new AttributeAppender("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.close.name(), a.getId()))));
+ item.add(new WebMarkupContainer("close").add(AttributeModifier.replace("onclick", String.format("activityAction(%s, '%s', '%s');", roomId, Action.close.name(), a.getId()))));
item.add(accept, decline, find, new Label("text", text));
item.add(AttributeModifier.append("class", getClass(a)));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index b3c78e2..9bb3a99 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -59,7 +59,6 @@ import org.apache.openmeetings.web.room.poll.PollResultsDialog;
import org.apache.openmeetings.web.room.poll.VoteDialog;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
@@ -250,7 +249,7 @@ public class RoomMenuPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
- add(askBtn.add(new AttributeAppender("title", getString("84"))));
+ add(askBtn.add(AttributeModifier.replace("title", getString("84"))));
Label demo = new Label("demo", Model.of(""));
Room r = room.getRoom();
add(demo.setVisible(r.isDemoRoom() && r.getDemoTime() != null && room.getRoom().getDemoTime().intValue() > 0));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
index 62747b1..a9c1ae8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
@@ -43,8 +43,8 @@ import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.room.VideoSettings;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.ajax.AjaxDownloadBehavior;
import org.apache.wicket.request.resource.ResourceStreamResource;
import org.apache.wicket.util.resource.IResourceStream;
@@ -68,7 +68,7 @@ public class StartSharingButton extends OmButton {
this.uid = uid;
setOutputMarkupPlaceholderTag(true);
setVisible(false);
- add(new AttributeAppender("title", Application.getString("1480")));
+ add(AttributeModifier.replace("title", Application.getString("1480")));
add(download = new AjaxDownloadBehavior(new ResourceStreamResource() {
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
index 8dec794..1b3889f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomClientPanel.java
@@ -50,7 +50,7 @@ public class RoomClientPanel extends Panel {
final String name = getName(c);
add(new Label("name", name));
add(new UserSpeaksIcon("user-speaks", uid, room));
- item.add(new AttributeModifier("title", name));
+ item.add(AttributeModifier.replace("title", name));
WebMarkupContainer actions = new WebMarkupContainer("actions");
actions.add(new KickIcon("kick", uid, room));
actions.add(new WebMarkupContainer("privateChat").setVisible(!room.getRoom().isHidden(RoomElement.Chat) && !getUserId().equals(c.getUserId())));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 9e3787d..d1f87dd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -74,10 +74,10 @@ import org.apache.pdfbox.pdmodel.PDPageContentStream.AppendMode;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.list.ListItem;
@@ -154,7 +154,7 @@ public class WbPanel extends AbstractWbPanel {
protected void populateItem(ListItem<String> item) {
String cls = String.format("clipart-%s", item.getIndex());
item.add(append("class", cls), append("data-mode", cls)
- , new AttributeAppender("data-image", item.getModelObject()).setSeparator(""));
+ , AttributeModifier.replace("data-image", item.getModelObject()));
}
}, fileName);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 761a800..020b92d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -32,7 +32,6 @@ import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.service.calendar.caldav.AppointmentManager;
import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -43,7 +42,6 @@ import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.UrlTextField;
import org.apache.wicket.model.CompoundPropertyModel;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.validator.UrlValidator;
@@ -533,22 +531,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
//Add new AttributeModifier to change the type of URLTextField, to text for
//Google Calendar and to URL for a normal CalDAV calendar
- url.add(new AttributeModifier("type", new IModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return gcal.getModelObject() ? "text" : "url";
- }
- }) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isTemporary(Component component) {
- //This is a temporary model.
- return true;
- }
- });
+ url.add(AttributeModifier.replace("type", gcal.getModelObject() ? "text" : "url"));
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
index abb807e..def5df0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.java
@@ -51,7 +51,7 @@ public class RoomsTabbedPanel extends UserPanel {
Group org = item.getModelObject().getGroup();
item.add(new WebMarkupContainer("link")
.add(new Label("name", Model.of(org.getName())))
- .add(new AttributeModifier("href", "#org" + org.getId())));
+ .add(AttributeModifier.replace("href", "#org" + org.getId())));
}
});
add(new ListView<GroupUser>("orgRooms", u.getGroupUsers()) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8accd70c/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
new file mode 100644
index 0000000..eb6246b
--- /dev/null
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/cli/TestAdmin.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.cli;
+
+import static org.junit.Assert.fail;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestAdmin {
+ @Test
+ public void testNoParams() {
+ try {
+ Admin.handle();
+ fail();
+ } catch (ExitException ee) {
+ Assert.assertTrue(true);
+ }
+ }
+}