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/07/27 16:10:48 UTC
openmeetings git commit: [OPENMEETINGS-1675] user for derby is
hardcoded
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 8d05413bd -> 3f1968e73
[OPENMEETINGS-1675] user for derby is hardcoded
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/3f1968e7
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/3f1968e7
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/3f1968e7
Branch: refs/heads/3.3.x
Commit: 3f1968e735516873344f912e289c6f0430a5b48b
Parents: 8d05413
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Jul 27 23:10:38 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Jul 27 23:10:38 2017 +0700
----------------------------------------------------------------------
.../web/pages/install/InstallWizard$DbStep.html | 8 ++---
.../web/pages/install/InstallWizard.java | 33 ++++++++++----------
.../classes/META-INF/derby_persistence.xml | 4 +--
3 files changed, 23 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3f1968e7/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
index 803f52d..54bc96a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard$DbStep.html
@@ -27,19 +27,19 @@
<div class="formelement">
<label wicket:for="dbType"><wicket:message key="install.wizard.db.step.dbtype" /></label> <select wicket:id="dbType"></select>
</div>
- <div wicket:id="hostelem" class="formelement">
+ <div wicket:enclosure="host" class="formelement">
<label wicket:for="host"><wicket:message key="install.wizard.db.step.host" /></label> <input type="text" wicket:id="host"/>
</div>
- <div wicket:id="portelem" class="formelement">
+ <div wicket:enclosure="port" class="formelement">
<label wicket:for="port"><wicket:message key="install.wizard.db.step.port" /></label> <input type="text" wicket:id="port"/>
</div>
<div class="formelement">
<label wicket:for="dbname"><wicket:message key="install.wizard.db.step.dbname" /></label> <input type="text" wicket:id="dbname"/>
</div>
- <div class="formelement">
+ <div wicket:enclosure="login" class="formelement">
<label wicket:for="login"><wicket:message key="install.wizard.db.step.user" /></label> <input type="text" wicket:id="login"/>
</div>
- <div class="formelement">
+ <div wicket:enclosure="password" class="formelement">
<label wicket:for="password"><wicket:message key="install.wizard.db.step.pass" /></label> <input type="text" wicket:id="password"/>
</div>
<div class="formelement" style="max-width:860px;">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3f1968e7/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 6c65334..05a6629 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
@@ -97,7 +97,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class InstallWizard extends AbstractWizard<InstallationConfig> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(InstallWizard.class, webAppRootKey);
- private final static List<SelectOption> yesNoList = Arrays.asList(SelectOption.NO, SelectOption.YES);
+ private final static List<SelectOption> yesNoList = Arrays.asList(SelectOption.NO_NUM, SelectOption.YES_NUM);
private final static List<SelectOption> yesNoTextList = Arrays.asList(SelectOption.NO_TEXT, SelectOption.YES_TEXT);
private final static List<String> allFonts = Arrays.asList("TimesNewRoman", "Verdana", "Arial");
private final IDynamicWizardStep welcomeStep;
@@ -211,11 +211,11 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
private final class DbStep extends BaseStep {
private static final long serialVersionUID = 1L;
- private final WebMarkupContainer hostelem = new WebMarkupContainer("hostelem");
- private final WebMarkupContainer portelem = new WebMarkupContainer("portelem");
private final RequiredTextField<String> host = new RequiredTextField<>("host", Model.of(""));
private final RequiredTextField<Integer> port = new RequiredTextField<>("port", Model.of(0));
private final RequiredTextField<String> dbname = new RequiredTextField<>("dbname", Model.of(""));
+ private final RequiredTextField<String> user = new RequiredTextField<>("login");
+ private final TextField<String> pass = new TextField<>("password");
private final Form<ConnectionProperties> form = new Form<ConnectionProperties>("form", new CompoundPropertyModel<>(getProps(null))) {
private static final long serialVersionUID = 1L;
private final DropDownChoice<DbType> db = new DropDownChoice<>("dbType", Arrays.asList(DbType.values()), new ChoiceRenderer<DbType>() {
@@ -231,8 +231,6 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
return object.name();
}
});
- private final RequiredTextField<String> user = new RequiredTextField<>("login");
- private final TextField<String> pass = new TextField<>("password");
{
add(db.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -243,8 +241,7 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
initForm(true, target);
}
}));
- add(hostelem.add(host), portelem.add(port));
- add(dbname, user, pass);
+ add(host, port, dbname, user, pass);
add(new IndicatingAjaxButton("check") {
private static final long serialVersionUID = 1L;
@@ -330,9 +327,11 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
try {
File conf = OmFileHelper.getPersistence(type);
props = ConnectionPropertiesPatcher.getConnectionProperties(conf);
- // resetting default login/password
- props.setLogin(null);
- props.setPassword(null);
+ if (DbType.derby != props.getDbType()) {
+ // resetting default login/password
+ props.setLogin(null);
+ props.setPassword(null);
+ }
} catch (Exception e) {
form.warn(getString("install.wizard.db.step.errorprops"));
}
@@ -342,8 +341,10 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
private void initForm(boolean getProps, AjaxRequestTarget target) {
ConnectionProperties props = getProps ? getProps(form.getModelObject().getDbType()) : form.getModelObject();
form.setModelObject(props);
- hostelem.setVisible(props.getDbType() != DbType.derby);
- portelem.setVisible(props.getDbType() != DbType.derby);
+ host.setVisible(props.getDbType() != DbType.derby);
+ port.setVisible(props.getDbType() != DbType.derby);
+ user.setVisible(props.getDbType() != DbType.derby);
+ pass.setVisible(props.getDbType() != DbType.derby);
try {
switch (props.getDbType()) {
case mssql: {
@@ -761,9 +762,9 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
private static class SelectOption implements Serializable {
private static final long serialVersionUID = 1L;
- private static SelectOption NO = new SelectOption("0", "No");
+ private static SelectOption NO_NUM = new SelectOption("0", "No");
private static SelectOption NO_TEXT = new SelectOption("no", "No");
- private static SelectOption YES = new SelectOption("1", "Yes");
+ private static SelectOption YES_NUM = new SelectOption("1", "Yes");
private static SelectOption YES_TEXT = new SelectOption("yes", "Yes");
public String key;
@SuppressWarnings("unused")
@@ -849,8 +850,8 @@ public class InstallWizard extends AbstractWizard<InstallationConfig> {
YesNoDropDown(String id) {
super(id);
setChoices(yesNoList);
- this.option = SelectOption.NO.key.equals(propModel.getObject()) ?
- SelectOption.NO : SelectOption.YES;
+ this.option = SelectOption.NO_NUM.key.equals(propModel.getObject()) ?
+ SelectOption.NO_NUM : SelectOption.YES_NUM;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/3f1968e7/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
index e70e0a5..c6a6d9c 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/classes/META-INF/derby_persistence.xml
@@ -74,8 +74,8 @@
MaxActive=100,
MaxWait=10000,
TestOnBorrow=true,
- Username=${db_user},
- Password=${db_pass}" />
+ Username=omdbuser,
+ Password=" />
<property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema" />
<property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO" />
<property name="openjpa.DataCache" value="true" />