Author: tchemit Date: 2013-08-01 08:26:47 +0200 (Thu, 01 Aug 2013) New Revision: 826 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/826 Log: fixes #2245: Pouvoir se connecter ?\195?\160 la base de travail avec un autre utilisateur fixes do not use html5 tags required (use struts requiredLabel instead) Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java trunk/echobase-domain/src/main/xmi/echobase-internal.zargo trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallBackForVersion2_2.java 2013-08-01 06:26:47 UTC (rev 826) @@ -38,10 +38,10 @@ import java.util.List; /** - * TODO + * Migrate internal db to version {@code 2.2}. * * @author tchemit <chemit@codelutin.com> - * @since TODO + * @since 2.2 */ public class MigrationCallBackForVersion2_2 extends MigrationCallBackForVersion { @Override @@ -57,10 +57,18 @@ List<String> queries, boolean showSql, boolean showProgression) throws TopiaException { - // normalize queries names + + // normalize queries names (http://forge.codelutin.com/issues/2875) normalizeExportQueryNames(tx, queries); + + // remove login from workingdbconfiguration (http://forge.codelutin.com/issues/2245) + removeLoginField(queries); } + protected void removeLoginField(List<String> queries) { + queries.add("ALTER TABLE WorkingDbConfiguration DROP COLUMN login"); + } + protected void normalizeExportQueryNames(TopiaContextImplementor tx, List<String> queries) { TopiaSQLQuery<ExportQuery> query = new TopiaSQLQuery<ExportQuery>() { Modified: trunk/echobase-domain/src/main/xmi/echobase-internal.zargo =================================================================== (Binary files differ) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DecoratorService.java 2013-08-01 06:26:47 UTC (rev 826) @@ -190,7 +190,7 @@ // WorkingDbConfiguration decorator - registerJXPathDecorator(locale, WorkingDbConfiguration.class, "${url}$s - ${login}$s (${description}$s)"); + registerJXPathDecorator(locale, WorkingDbConfiguration.class, "${url}$s - (${description}$s)"); // AcousticInstrument decorator registerJXPathDecorator(locale, AcousticInstrument.class, "${id}$s"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/workingDb/WorkingDbConfigurationService.java 2013-08-01 06:26:47 UTC (rev 826) @@ -56,7 +56,6 @@ result.setTopiaId(entity.getTopiaId()); result.setDescription(entity.getDescription()); result.setDriverType(entity.getDriverType()); - result.setLogin(entity.getLogin()); String url = entity.getUrl(); if (url.contains("${echobase.data.directory}")) { @@ -119,7 +118,6 @@ if (!isUrlAlreadyUsed(url)) { WorkingDbConfiguration conf = newConfiguration(); conf.setDriverType(DriverType.H2); - conf.setLogin("sa"); conf.setDescription("Embedded working db"); conf.setUrl(url); try { Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Connect.java 2013-08-01 06:26:47 UTC (rev 826) @@ -41,10 +41,20 @@ private static final long serialVersionUID = 1L; + protected String login; + protected String password; protected JdbcConfiguration jdbcConf; + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + public String getPassword() { return password; } @@ -69,6 +79,10 @@ } catch (SQLException e) { jdbcConf = null; addFieldError( + "login", + _("echobase.error.workingDbConfiguration.couldNotConnect", + e.getMessage())); + addFieldError( "password", _("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); @@ -82,7 +96,7 @@ jdbcConf = JdbcConfiguration.newConfig( getConf().getDriverType(), getConf().getUrl(), - getConf().getLogin(), password); + login, password); // check connexion is ok try { @@ -90,6 +104,10 @@ } catch (SQLException e) { jdbcConf = null; addFieldError( + "login", + _("echobase.error.workingDbConfiguration.couldNotConnect", + e.getMessage())); + addFieldError( "password", _("echobase.error.workingDbConfiguration.couldNotConnect", e.getMessage())); @@ -104,6 +122,9 @@ if (DriverType.H2.equals(conf.getDriverType()) && StringUtils.isBlank(getPassword())) { + // use default h2 login + setLogin("sa"); + // use a default h2 password setPassword("sa"); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java 2013-08-01 06:26:47 UTC (rev 826) @@ -95,12 +95,6 @@ } } - if (StringUtils.isBlank(getConf().getLogin())) { - addFieldError( - "conf.login", - _("echobase.error.workingDbConfiguration.login.required")); - } - if (StringUtils.isBlank(getConf().getDescription())) { addFieldError( "conf.description", Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -217,7 +217,7 @@ enctype="multipart/form-data"> <s:hidden key="entityType" label=''/> - <s:file key="importFile" required="true" + <s:file key="importFile" requiredLabel="true" label="%{getText('echobase.label.importFile')}"/> <s:checkbox key='createIfNotFound' value='true' @@ -232,7 +232,7 @@ <s:form id="exportForm" namespace="/dbeditor" method="post"> <s:hidden key="entityType" label=''/> - <s:textfield key="exportFileName" required="true" size="100" + <s:textfield key="exportFileName" requiredLabel="true" size="100" label="%{getText('echobase.label.exportFileName')}"/> <s:checkbox key='exportAsSeen' value='false' Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/embeddedApplication/configure.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -38,7 +38,7 @@ template="mycheckboxlist" label="%{getText('echobase.label.voyageToSelect')}"/> - <s:textfield key="model.fileName" required="true" size="100" + <s:textfield key="model.fileName" requiredLabel="true" size="100" label="%{getText('echobase.label.embeddedApplicationFileName')} (*)"/> <s:label value="%{model.warLocation.name}" readonly="true" disabled="true" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportDb/configure.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -62,12 +62,12 @@ <br/> <s:radio id='mode' key='model.exportDbMode' list="modes" - cssClass="cleanBoth" required="true" template="myradiomap" + cssClass="cleanBoth" requiredLabel="true" template="myradiomap" label='%{getText("echobase.common.exportDbMode")}'/> <div class="cleanBoth"></div> <br/> - <s:textfield key="model.fileName" required="true" size="100" + <s:textfield key="model.fileName" requiredLabel="true" size="100" label="%{getText('echobase.label.exportDbFileName')} (*)"/> <div class="cleanBoth"></div> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/confirmDelete.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -42,15 +42,15 @@ - <s:textarea name="query.name" required="true" cols="160" rows="1" + <s:textarea name="query.name" requiredLabel="true" cols="160" rows="1" readonly="true" label="%{getText('echobase.label.query.name')}"/> - <s:textarea name="query.description" required="true" cols="160" rows="2" + <s:textarea name="query.description" requiredLabel="true" cols="160" rows="2" readonly="true" label="%{getText('echobase.label.query.description')}"/> - <s:textarea name="query.sqlQuery" required="true" cols="160" rows="4" + <s:textarea name="query.sqlQuery" requiredLabel="true" cols="160" rows="4" label="%{getText('echobase.label.query.sql')}"/> <br/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQuery.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -97,15 +97,15 @@ <fieldset> <legend><s:text name="echobase.legend.sqlQuery.configuration"/></legend> - <s:textarea key="query.name" required="true" cols="160" rows="1" + <s:textarea key="query.name" requiredLabel="true" cols="160" rows="1" readonly="%{queryExists and !canUpdateQuery}" label="%{getText('echobase.label.query.name')}"/> - <s:textarea key="query.description" required="true" cols="160" rows="2" + <s:textarea key="query.description" requiredLabel="true" cols="160" rows="2" readonly="%{queryExists and !canUpdateQuery}" label="%{getText('echobase.label.query.description')}"/> - <s:textarea key="query.sqlQuery" required="true" cols="160" rows="4" + <s:textarea key="query.sqlQuery" requiredLabel="true" cols="160" rows="4" readonly="%{queryExists and !canUpdateQuery}" label="%{getText('echobase.label.query.sql')}"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/exportQueryResult.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -56,7 +56,7 @@ <legend><s:text name="echobase.legend.sqlQuery.result"/></legend> <s:hidden key="queryId" label=""/> - <s:textfield key="fileName" required="true" size="100" + <s:textfield key="fileName" requiredLabel="true" size="100" label="%{getText('echobase.label.exportFileName')}"/> <s:submit value="%{getText('echobase.action.exportSqlData')}" align="left"/> <br/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/exportQuery/newLibreOfficeQuery.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -67,7 +67,7 @@ <fieldset class="ui-corner-all"> <legend><s:text name="echobase.legend.libreOfficeQuery"/></legend> - <s:textarea name="libreOfficeQuery" required="true" cols="500" rows="8" + <s:textarea name="libreOfficeQuery" requiredLabel="true" cols="500" rows="8" theme="simple" value=""/> <ul class="toolbar floatRight"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureAcousticImport.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -59,14 +59,14 @@ </div> <br/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <sj:select key="model.vesselId" required="true" + <sj:select key="model.vesselId" requiredLabel="true" label='%{getText("echobase.common.vessel")}'/> - <s:select key="model.cellPositionReference" required="true" + <s:select key="model.cellPositionReference" requiredLabel="true" label='%{getText("echobase.common.cellPositionReference")}' list="cellPositionReferences" headerKey="" headerValue=""/> @@ -74,53 +74,53 @@ label='%{getText("echobase.common.addDataAcquisition")}'/> <s:textfield key="model.transceiverAcquisitionAbsorptionDescription" - size="80" required="true" + size="80" requiredLabel="true" label='%{getText("echobase.common.transceiverAcquisitionAbsorptionDescription")}'/> <s:textfield key="model.acquisitionSoftwareVersionER60" size="80" - required="true" + requiredLabel="true" label='%{getText("echobase.common.acquisitionSoftwareVersionER60")}'/> <s:textfield key="model.acquisitionSoftwareVersionME70" size="80" - required="true" + requiredLabel="true" label='%{getText("echobase.common.acquisitionSoftwareVersionME70")}'/> - <s:textfield key="model.loggedDataFormat" size="80" required="true" + <s:textfield key="model.loggedDataFormat" size="80" requiredLabel="true" label='%{getText("echobase.common.loggedDataFormat")}'/> - <s:textfield key="model.loggedDataDatatype" size="80" required="true" + <s:textfield key="model.loggedDataDatatype" size="80" requiredLabel="true" label='%{getText("echobase.common.loggedDataDatatype")}'/> - <s:textfield key="model.pingDutyCycle" size="80" required="true" + <s:textfield key="model.pingDutyCycle" size="80" requiredLabel="true" label='%{getText("echobase.common.pingDutyCycle")}'/> <s:textfield key="model.soundSpeedCalculationsER60" size="80" - required="true" + requiredLabel="true" label='%{getText("echobase.common.soundSpeedCalculationsER60")}'/> <s:textfield key="model.soundSpeedCalculationsME70" size="80" - required="true" + requiredLabel="true" label='%{getText("echobase.common.soundSpeedCalculationsME70")}'/> - <s:textfield key="model.sounderConstant" size="80" required="true" + <s:textfield key="model.sounderConstant" size="80" requiredLabel="true" label='%{getText("echobase.common.sounderConstant")}'/> - <s:textfield key="model.processingTemplate" size="80" required="true" + <s:textfield key="model.processingTemplate" size="80" requiredLabel="true" label='%{getText("echobase.common.processingTemplate")}'/> - <s:textfield key="model.processingDescription" size="80" required="true" + <s:textfield key="model.processingDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.processingDescription")}'/> - <s:textfield key="model.digitThreshold" size="80" required="true" + <s:textfield key="model.digitThreshold" size="80" requiredLabel="true" label='%{getText("echobase.common.digitThreshold")}'/> - <s:textfield key="model.acousticDensityUnit" size="80" required="true" + <s:textfield key="model.acousticDensityUnit" size="80" requiredLabel="true" label='%{getText("echobase.common.acousticDensityUnit")}'/> - <s:textfield key="model.notes" size="80" required="true" + <s:textfield key="model.notes" size="80" requiredLabel="true" label='%{getText("echobase.common.dataProcessingNotes")}'/> - <s:file key="moviesFile" required="true" + <s:file key="moviesFile" requiredLabel="true" label='%{getText("echobase.common.moviesFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCatchesImport.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -52,11 +52,11 @@ </div> <br/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:label key="echobase.information.one.file.required" required="true" + <s:label key="echobase.information.one.file.required" requiredLabel="true" value=''/> <s:file key="totalSampleFile" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureCommonImport.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -46,7 +46,7 @@ <s:radio id='mode' key='model.importType' list="importTypes" cssClass="cleanBoth" label='%{getText("echobase.common.importType")}' - required="true" template="myradiomap"/> + requiredLabel="true" template="myradiomap"/> <hr/> @@ -67,43 +67,43 @@ </div> <br/> - <s:select key="model.missionId" required="true" + <s:select key="model.missionId" requiredLabel="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> <s:hidden key="model.importType" value="COMMON_ALL" label=''/> - <s:select key="model.areaOfOperationId" required="true" + <s:select key="model.areaOfOperationId" requiredLabel="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="80" required="true" + <s:textfield key="model.voyageDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.voyageDescription")}'/> - <s:textfield key="model.datum" size="80" required="true" + <s:textfield key="model.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:textfield key="model.transitRelatedActivity" size="80" required="true" + <s:textfield key="model.transitRelatedActivity" size="80" requiredLabel="true" label='%{getText("echobase.common.transitRelatedActivity")}'/> - <s:textfield key="model.transectLicence" size="80" required="true" + <s:textfield key="model.transectLicence" size="80" requiredLabel="true" label='%{getText("echobase.common.transectLicence")}'/> <s:textfield key="model.transectGeospatialVerticalPositive" size="80" - required="true" + requiredLabel="true" label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> - <s:textfield key="model.transectBinUnitsPingAxis" size="80" required="true" + <s:textfield key="model.transectBinUnitsPingAxis" size="80" requiredLabel="true" label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> - <s:file key="voyageFile" required="true" + <s:file key="voyageFile" requiredLabel="true" label='%{getText("echobase.common.voyageFile")}'/> - <s:file key="transitFile" required="true" + <s:file key="transitFile" requiredLabel="true" label='%{getText("echobase.common.transitFile")}'/> - <s:file key="transectFile" required="true" + <s:file key="transectFile" requiredLabel="true" label='%{getText("echobase.common.transectFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" @@ -133,24 +133,24 @@ </div> <br/> - <s:select key="model.missionId" required="true" + <s:select key="model.missionId" requiredLabel="true" label='%{getText("echobase.common.mission")}' list="missions" headerKey="" headerValue=""/> <br/> <s:hidden key="model.importType" value="COMMON_VOYAGE" label=''/> - <s:select key="model.areaOfOperationId" required="true" + <s:select key="model.areaOfOperationId" requiredLabel="true" label='%{getText("echobase.common.areaOfOperation")}' list="areaOfOperations" headerKey="" headerValue=""/> - <s:textfield key="model.voyageDescription" size="80" required="true" + <s:textfield key="model.voyageDescription" size="80" requiredLabel="true" label='%{getText("echobase.common.voyageDescription")}'/> - <s:textfield key="model.datum" size="80" required="true" + <s:textfield key="model.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:file key="voyageFile" required="true" + <s:file key="voyageFile" requiredLabel="true" label='%{getText("echobase.common.voyageFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" @@ -182,14 +182,14 @@ <s:hidden key="model.importType" value="COMMON_TRANSIT" label=''/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.transitRelatedActivity" size="80" required="true" + <s:textfield key="model.transitRelatedActivity" size="80" requiredLabel="true" label='%{getText("echobase.common.transitRelatedActivity")}'/> - <s:file key="transitFile" required="true" + <s:file key="transitFile" requiredLabel="true" label='%{getText("echobase.common.transitFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" @@ -221,24 +221,24 @@ </div> <br/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.datum" size="80" required="true" + <s:textfield key="model.datum" size="80" requiredLabel="true" label='%{getText("echobase.common.datum")}'/> - <s:textfield key="model.transectLicence" size="80" required="true" + <s:textfield key="model.transectLicence" size="80" requiredLabel="true" label='%{getText("echobase.common.transectLicence")}'/> <s:textfield key="model.transectGeospatialVerticalPositive" size="80" - required="true" + requiredLabel="true" label='%{getText("echobase.common.transectGeospatialVerticalPositive")}'/> - <s:textfield key="model.transectBinUnitsPingAxis" size="80" required="true" + <s:textfield key="model.transectBinUnitsPingAxis" size="80" requiredLabel="true" label='%{getText("echobase.common.transectBinUnitsPingAxis")}'/> - <s:file key="transectFile" required="true" + <s:file key="transectFile" requiredLabel="true" label='%{getText("echobase.common.transectFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureOperationImport.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -46,17 +46,17 @@ </div> <br/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:file key="operationFile" required="true" + <s:file key="operationFile" requiredLabel="true" label='%{getText("echobase.common.operationFile")}'/> - <s:file key="operationMetadataFile" required="true" + <s:file key="operationMetadataFile" requiredLabel="true" label='%{getText("echobase.common.operationMetadataFile")}'/> - <s:file key="gearMetadataFile" required="true" + <s:file key="gearMetadataFile" requiredLabel="true" label='%{getText("echobase.common.gearMetadataFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/configureResultsImport.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -57,7 +57,7 @@ </script> <s:radio id='mode' key='model.importType' list="importTypes" - cssClass="cleanBoth" required="true" template="myradiomap" + cssClass="cleanBoth" requiredLabel="true" template="myradiomap" label='%{getText("echobase.common.importType")}' /> <s:form id="RESULT_VOYAGE" namespace="/importData" method="POST" @@ -77,11 +77,11 @@ <s:hidden key="model.importType" value="RESULT_VOYAGE" label=''/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:label key="echobase.information.one.file.required" required="true" + <s:label key="echobase.information.one.file.required" requiredLabel="true" value=''/> <s:file key="lengthAgeKeyFile" @@ -117,18 +117,18 @@ <s:hidden key="model.importType" value="RESULT_ESDU" label=''/> - <s:select id='voyageSelectBox' key="model.voyageId" required="true" + <s:select id='voyageSelectBox' key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> <sj:select id='dataProcessingSelectBox' key="model.dataProcessingId" - required="true" + requiredLabel="true" label='%{getText("echobase.common.dataProcessing")}'/> - <s:textfield key="model.resultLabel" size="40" required="true" + <s:textfield key="model.resultLabel" size="40" requiredLabel="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:label key="echobase.information.one.file.required" required="true" + <s:label key="echobase.information.one.file.required" requiredLabel="true" value=''/> <s:file key="esduByEchotypeFile" @@ -167,20 +167,20 @@ <s:hidden key="model.importType" value="RESULT_REGION" label=''/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.resultLabel" size="40" required="true" + <s:textfield key="model.resultLabel" size="40" requiredLabel="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="regionsFile" required="true" + <s:file key="regionsFile" requiredLabel="true" label='%{getText("echobase.common.cellRegionsFile")}'/> - <s:file key="regionAssociationFile" required="true" + <s:file key="regionAssociationFile" requiredLabel="true" label='%{getText("echobase.common.cellRegionAssociationFile")}'/> - <s:file key="regionResultFile" required="true" + <s:file key="regionResultFile" requiredLabel="true" label='%{getText("echobase.common.cellRegionResultFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" @@ -207,14 +207,14 @@ <s:hidden key="model.importType" value="RESULT_MAP" label=''/> - <s:select key="model.voyageId" required="true" + <s:select key="model.voyageId" requiredLabel="true" label='%{getText("echobase.common.voyage")}' list="voyages" headerKey="" headerValue=""/> - <s:textfield key="model.resultLabel" size="40" required="true" + <s:textfield key="model.resultLabel" size="40" requiredLabel="true" label='%{getText("echobase.common.resultLabel")}'/> - <s:file key="mapsFile" required="true" + <s:file key="mapsFile" requiredLabel="true" label='%{getText("echobase.common.cellMapsFile")}'/> <s:textarea key="model.importNotes" cols="80" rows="5" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/createMission.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -33,10 +33,10 @@ <s:text name="echobase.legend.importData.createMission"/> </legend> - <s:textfield key="mission.name" size="40" required="true" + <s:textfield key="mission.name" size="40" requiredLabel="true" label='%{getText("echobase.common.name")}'/> - <s:textfield key="mission.missionAbstract" size="40" required="true" + <s:textfield key="mission.missionAbstract" size="40" requiredLabel="true" label='%{getText("echobase.common.missionAbstract")}'/> <s:textfield key="mission.litteratureReferences" size="40" Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importData/selectImportType.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -54,7 +54,7 @@ </legend> <s:radio key='mode' list="modes" cssClass="cleanBoth" label='%{getText("echobase.common.importDataMode")}' - required="true" template="myradiomap"/> + requiredLabel="true" template="myradiomap"/> </fieldset> <s:submit action="selectImportType" key='echobase.action.configureImport' Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/importDb/configure.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -39,11 +39,11 @@ </div> <br/> <s:radio id='mode' key='model.importDbMode' list="modes" - cssClass="cleanBoth" required="true" template="myradiomap" + cssClass="cleanBoth" requiredLabel="true" template="myradiomap" label='%{getText("echobase.common.importDbMode")}'/> <div class="cleanBoth"></div> <br/> - <s:file name="input" required="true" key="echobase.common.importDbFile"/> + <s:file name="input" requiredLabel="true" key="echobase.common.importDbFile"/> </fieldset> <br/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/Create.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -33,10 +33,10 @@ <s:text name="echobase.common.user"/> </legend> <s:textfield key="user.email" label="%{getText('echobase.common.email')}" - size="40" required="true"/> + size="40" requiredLabel="true"/> <s:password key="user.password" label="%{getText('echobase.common.password')}" - size="40" required="true"/> + size="40" requiredLabel="true"/> <s:checkbox key="user.admin" label="%{getText('echobase.common.admin')}"/> </fieldset> <ul class="toolbar floatRight"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -60,9 +60,9 @@ <fieldset class="ui-corner-all"> <s:hidden key="redirectAction" label=""/> <s:textfield name="email" key="echobase.common.email" - required="true" size="60"/> + requiredLabel="true" size="60"/> <s:password name="password" key="echobase.common.password" - required="true" size="60"/> + requiredLabel="true" size="60"/> </fieldset> <br/> <s:submit action="login" key="echobase.action.login" align="right"/> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/confirmDelete.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -48,9 +48,6 @@ <s:textarea name="conf.description" cols="160" rows="2" readonly="true" label="%{getText('echobase.label.workingDbConfiguration.description')}"/> - <s:textarea name="conf.login" readonly="true" cols="160" rows="4" - label="%{getText('echobase.label.workingDbConfiguration.login')}"/> - <br/> <s:form namespace="/workingDb"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2013-08-01 00:12:52 UTC (rev 825) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp 2013-08-01 06:26:47 UTC (rev 826) @@ -79,23 +79,23 @@ </legend> <s:select key="conf.driverType" cssStyle="font-size: 140%" - label="%{getText('echobase.label.driverType')}" required="true" + label="%{getText('echobase.label.driverType')}" requiredLabel="true" list="driverTypes" disabled="%{confExists}"/> - <s:textfield key="conf.url" required="true" size="80" + <s:textfield key="conf.url" requiredLabel="true" size="80" readonly="%{confExists}" label="%{getText('echobase.label.workingDbConfiguration.url')}"/> - <s:textarea key="conf.description" required="true" cols="160" rows="4" + <s:textarea key="conf.description" requiredLabel="true" cols="160" rows="4" readonly="%{confExists}" label="%{getText('echobase.label.workingDbConfiguration.description')}"/> - <s:textfield key="conf.login" required="true" size="80" - readonly="%{confExists}" - label="%{getText('echobase.label.workingDbConfiguration.login')}"/> + <s:if test="confExists"> - <s:if test="confExists"> - <s:password key="password" required="true" size="80" + <s:textfield key="login" requiredLabel="true" size="80" + label="%{getText('echobase.label.workingDbConfiguration.login')}"/> + + <s:password key="password" requiredLabel="true" size="80" label="%{getText('echobase.label.workingDbConfiguration.password')}"/> </s:if>