Repository: openmeetings Updated Branches: refs/heads/master d9ec9b3f7 -> 2689ffdd0
[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/2689ffdd Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2689ffdd Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2689ffdd Branch: refs/heads/master Commit: 2689ffdd0ef7a261b28df03b0761f252fd4b9358 Parents: d9ec9b3 Author: Maxim Solodovnik <[email protected]> Authored: Thu Jul 27 23:10:38 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Jul 27 23:11:10 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/2689ffdd/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/2689ffdd/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 1aa4bb3..fb75556 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: { @@ -750,9 +751,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") @@ -838,8 +839,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/2689ffdd/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 e447fda..3be6772 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" />
