February 2008 - Simexplorer-si-commits - mailman.cloud.codelutin.com

r685 - in trunk: simexplorer-is/src/site/fr/rst simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages simexplorer-is-web/src/main/webapp simexplorer-is-web/src/main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: glandais Date: 2008-02-05 14:28:57 +0000 (Tue, 05 Feb 2008) New Revision: 685 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml trunk/simexplorer-is-web/src/main/webapp/Login.tml trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: Login message & exception handling Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-05 14:28:57 UTC (rev 685) @@ -15,10 +15,6 @@ Client léger ============ - - Explication rejet login - - Internationalisation - - Gestion des exceptions - Consultation ------------ Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-02-05 14:28:57 UTC (rev 685) @@ -84,10 +84,11 @@ if (simException != null) { _unknown = false; this.exception = simException; - + /* _unknown = true; ExceptionAnalysis analysis = analyzer.analyze(exceptionReported); _stack = analysis.getExceptionInfos(); + */ } else { _unknown = true; ExceptionAnalysis analysis = analyzer.analyze(exceptionReported); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-05 14:28:57 UTC (rev 685) @@ -18,8 +18,11 @@ package fr.cemagref.simexplorer.is.ui.web.pages; import org.apache.tapestry.annotations.ApplicationState; +import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.corelib.components.Form; +import org.apache.tapestry.corelib.components.TextField; import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; @@ -51,24 +54,28 @@ @Inject private Messages messages; + /** The form. */ + @Component + private Form form; + /** * On success. * * @return the object */ public Object onSuccess() { - Object result = null; try { token = RemoteSecurityService.getAuthentificationService() .loginUser(user, password); - if (token != null) { - result = elementList; + System.out.println(token); + if (token != null && !token.equals("")) { + return elementList; } + form.recordError(messages.get("simexplorer.ui.web.login.invalid")); + return this; } catch (SimExplorerServiceException e) { throw new SimExplorerWebException(e); } - - return result; } /** Modified: trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml 2008-02-05 14:28:57 UTC (rev 685) @@ -9,7 +9,7 @@ <p>${message:simexplorer.ui.web.error.errorMessage}</p> - <div t:type="t5components/SlidingPanel" closed="true" subject="${message:exceptionDetails}"> + <div t:type="t5components/SlidingPanel" closed="true" subject="${message:simexplorer.ui.web.error.exceptionDetails}"> <div class="t-exception-report" id="errordetail"> <ul> <t:loop source="stack" value="info"> Modified: trunk/simexplorer-is-web/src/main/webapp/Login.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/Login.tml 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is-web/src/main/webapp/Login.tml 2008-02-05 14:28:57 UTC (rev 685) @@ -8,11 +8,11 @@ <t:errors /> ${message:simexplorer.ui.web.user} : - <input t:type="TextField" t:id="user" + <input t:type="TextField" t:id="userField" t:validate="required,minlength=1" t:value="user" size="30" /> <br /> ${message:simexplorer.ui.web.password} : - <input t:type="PasswordField" t:id="password" + <input t:type="PasswordField" t:id="passwordField" t:validate="required,minlength=1" t:value="password" size="30" /> <br /> <input t:type="Submit" t:value="${message:simexplorer.ui.web.login}" /> Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 14:28:57 UTC (rev 685) @@ -115,5 +115,6 @@ simexplorer.ui.web.error.unknowException=Unknown exception simexplorer.ui.web.error.errorMessage=An unknown error occured. +simexplorer.ui.web.error.exceptionDetails=Error details simexplorer.ui.web.generatedata=Generate data Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-05 12:18:09 UTC (rev 684) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-05 14:28:57 UTC (rev 685) @@ -66,6 +66,8 @@ simexplorer.ui.web.layout.install=Générer des données +simexplorer.ui.web.login.invalid=Echec de la connexion + simexplorer.ui.web.back=Retour simexplorer.ui.web.cancel=Annuler simexplorer.ui.web.confirm=Confirmer @@ -115,5 +117,6 @@ simexplorer.ui.web.error.unknowException=Exception inconnue simexplorer.ui.web.error.errorMessage=Une erreur inconnue s'est produite. +simexplorer.ui.web.error.exceptionDetails=Détails de l'erreur simexplorer.ui.web.generatedata=Generate data

1 0

r684 - in trunk/simexplorer-is-web/src: main/webapp main/webapp/WEB-INF resources/fr/cemagref/simexplorer/is/ui/web/components
by glandais＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: glandais Date: 2008-02-05 12:18:09 +0000 (Tue, 05 Feb 2008) New Revision: 684 Removed: trunk/simexplorer-is-web/src/main/webapp/images/ trunk/simexplorer-is-web/src/main/webapp/js/ Modified: trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml trunk/simexplorer-is-web/src/main/webapp/ElementImport.tml trunk/simexplorer-is-web/src/main/webapp/ElementList.tml trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml trunk/simexplorer-is-web/src/main/webapp/GroupList.tml trunk/simexplorer-is-web/src/main/webapp/Install.tml trunk/simexplorer-is-web/src/main/webapp/Login.tml trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml trunk/simexplorer-is-web/src/main/webapp/UserList.tml trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml Log: i18n Modified: trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ElementDelete.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -1,18 +1,18 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <p>${message:confirmdelete}</p> - <p><t:actionlink t:id="confirm">${message:confirm}</t:actionlink> - - <t:back label="${message:cancel}" /></p> + <p>${message:simexplorer.ui.web.delete.confirmdelete}</p> + <p><t:actionlink t:id="confirm">${message:simexplorer.ui.web.confirm}</t:actionlink> - + <t:back label="${message:simexplorer.ui.web.cancel}" /></p> <hr /> - <p>${message:confirmdeleteAll}</p> - <p><t:actionlink t:id="confirmall">${message:confirm}</t:actionlink> - - <t:back label="${message:cancel}" /></p> + <p>${message:simexplorer.ui.web.delete.confirmdeleteAll}</p> + <p><t:actionlink t:id="confirmall">${message:simexplorer.ui.web.confirm}</t:actionlink> + - <t:back label="${message:simexplorer.ui.web.cancel}" /></p> <hr /> - <p><t:back label="${message:back}" /></p> + <p><t:back label="${message:simexplorer.ui.web.back}" /></p> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ElementExport.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -1,19 +1,19 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <p><t:actionlink t:id="downloadXML">${message:downloadxml}</t:actionlink> + <p><t:actionlink t:id="downloadXML">${message:simexplorer.ui.web.export.downloadxml}</t:actionlink> </p> - <p><t:actionlink t:id="downloadFull">${message:downloadfull}</t:actionlink> + <p><t:actionlink t:id="downloadFull">${message:simexplorer.ui.web.export.downloadfull}</t:actionlink> </p> <p> - <h2>${message:attachments}</h2> + <h2>${message:simexplorer.ui.web.export.attachments}</h2> </p> <p> <table t:type="cl/TreeGrid" source="nodes" columnHeaders="headers"> </table> </p> - <p><t:back label="${message:back}" /></p> + <p><t:back label="${message:simexplorer.ui.web.back}" /></p> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ElementHistory.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -4,6 +4,6 @@ <table t:type="cl/TreeGrid" source="versions" columnHeaders="headers"> </table> - <p><t:back label="${message:back}" /></p> + <p><t:back label="${message:simexplorer.ui.web.back}" /></p> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementImport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementImport.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ElementImport.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -1,20 +1,19 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <t:form> - <t:errors/> + <t:form> + <t:errors /> - <h1 class="Title">${message:explorationapplication}</h1> + <p>${message:simexplorer.ui.web.import.explorationapplication}</p> - <input t:type="upload" t:id="fileEA"/> - <br/> - - <h1 class="Title">${message:library}</h1> + <p><input t:type="upload" t:id="fileEA" /></p> - <input t:type="upload" t:id="fileLib"/> - <br/> - - <input type="submit" value="${message:upload}"/> - </t:form> - + <p>${message:simexplorer.ui.web.import.library}</p> + + <p><input t:type="upload" t:id="fileLib" /></p> + + <p><input type="submit" + value="${message:simexplorer.ui.web.upload}" /></p> + </t:form> + </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementList.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementList.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ElementList.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -1,11 +1,11 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <h1 class="Title">${windowtitle}</h1> + <h1 class="Title">${windowtitle}</h1> <table t:type="Grid" source="elements" row="element" model="model"> <t:parameter name="uuidCell"> - <t:actionlink t:id="detailElement" context="${detailElementContext}">Details</t:actionlink> + <t:actionlink t:id="detailElement" context="${detailElementContext}">${message:simexplorer.ui.web.elementlist.details}</t:actionlink> </t:parameter> </table> Modified: trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ElementRights.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -4,48 +4,48 @@ <t:form> <p> - <h2>${message:properties}</h2> + <h2>${message:simexplorer.ui.web.rights.properties}</h2> </p> <p></p> <hr /> <p> - <h2>${message:owner}</h2> + <h2>${message:simexplorer.ui.web.rights.owner}</h2> </p> <p><input t:type="Palette" model="users" selected="ownerUsers" - encoder="userEncoder" />${message:groups} :<input t:type="Palette" + encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input t:type="Palette" model="groups" selected="ownerGroups" encoder="groupEncoder" /></p> <hr /> <p> - <h2>${message:read}</h2> + <h2>${message:simexplorer.ui.web.rights.read}</h2> </p> - <p>${message:users} :<input t:type="Palette" model="users" - selected="readUsers" encoder="userEncoder" />${message:groups} :<input + <p>${message:simexplorer.ui.web.rights.users} :<input t:type="Palette" model="users" + selected="readUsers" encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input t:type="Palette" model="groups" selected="readGroups" encoder="groupEncoder" /></p> <hr /> <p> - <h2>${message:write}</h2> + <h2>${message:simexplorer.ui.web.rights.write}</h2> </p> - <p>${message:users} :<input t:type="Palette" model="users" - selected="writeUsers" encoder="userEncoder" />${message:groups} :<input + <p>${message:simexplorer.ui.web.rights.users} :<input t:type="Palette" model="users" + selected="writeUsers" encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input t:type="Palette" model="groups" selected="writeGroups" encoder="groupEncoder" /></p> <hr /> <p> - <h2>${message:admin}</h2> + <h2>${message:simexplorer.ui.web.rights.admin}</h2> </p> - <p>${message:users} :<input t:type="Palette" model="users" - selected="adminUsers" encoder="userEncoder" />${message:groups} :<input + <p>${message:simexplorer.ui.web.rights.users} :<input t:type="Palette" model="users" + selected="adminUsers" encoder="userEncoder" />${message:simexplorer.ui.web.rights.groups} :<input t:type="Palette" model="groups" selected="adminGroups" encoder="groupEncoder" /></p> <hr /> - <p><input t:type="Submit" t:value="message:submit" /> <t:back - label="${message:back}" /></p> + <p><input t:type="Submit" t:value="${message:simexplorer.ui.web.submit}" /> <t:back + label="${message:simexplorer.ui.web.back}" /></p> </t:form> Modified: trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/ExceptionReport.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -5,9 +5,9 @@ <t:if test="unknown"> - <h1>${message:unknowException}</h1> + <h1>${message:simexplorer.ui.web.error.unknowException}</h1> - <p>${message:errorMessage}</p> + <p>${message:simexplorer.ui.web.error.errorMessage}</p> <div t:type="t5components/SlidingPanel" closed="true" subject="${message:exceptionDetails}"> <div class="t-exception-report" id="errordetail"> Modified: trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/GroupEdit.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -4,7 +4,7 @@ <t:form> <t:errors /> - <p>${message:name} : <input t:type="TextField" t:id="name" + <p>${message:simexplorer.ui.web.name} : <input t:type="TextField" t:id="name" t:validate="required,minlength=3" t:value="group.name" size="30" /></p> <t:if test="superAdmin"> @@ -12,15 +12,15 @@ t:value="owner" model="users" encoder="userEncoder" /></p> </t:if> - <p>${message:userMembers} : <input t:type="Palette" model="users" + <p>${message:simexplorer.ui.web.userMembers} : <input t:type="Palette" model="users" selected="usersInGroup" encoder="userEncoder" /></p> - <p>${message:groupMembers} : <input t:type="Palette" + <p>${message:simexplorer.ui.web.groupMembers} : <input t:type="Palette" model="groups" selected="groupsInGroup" encoder="groupEncoder" /></p> - <input t:type="Submit" t:value="message:submit" /> + <input t:type="Submit" t:value="message:simexplorer.ui.web.submit" /> - <a t:type="actionlink" t:id="cancel">${message:cancel}</a> + <a t:type="actionlink" t:id="cancel">${message:simexplorer.ui.web.cancel}</a> </t:form> Modified: trunk/simexplorer-is-web/src/main/webapp/GroupList.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/GroupList.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -4,13 +4,13 @@ <p> <table t:type="Grid" source="groups" row="group" model="model"> <t:parameter name="editCell"> - <t:actionlink t:id="edit" context="group.id">${message:modify}</t:actionlink> + <t:actionlink t:id="edit" context="group.id">${message:simexplorer.ui.web.modify}</t:actionlink> </t:parameter> <t:parameter name="deleteCell"> - <t:actionlink t:id="delete" context="group.id">${message:delete}</t:actionlink> + <t:actionlink t:id="delete" context="group.id">${message:simexplorer.ui.web.delete}</t:actionlink> </t:parameter> </table> </p> - <p><t:actionlink t:id="add">${message:addgroup}</t:actionlink></p> + <p><t:actionlink t:id="add">${message:simexplorer.ui.web.addgroup}</t:actionlink></p> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/Install.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/Install.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/Install.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -1,6 +1,6 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - <t:actionlink t:id="generatedata">${message:generatedata}</t:actionlink> + <t:actionlink t:id="generatedata">${message:simexplorer.ui.web.generatedata}</t:actionlink> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/Login.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/Login.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/Login.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -7,15 +7,15 @@ <t:errors /> - ${message:user} : + ${message:simexplorer.ui.web.user} : <input t:type="TextField" t:id="user" t:validate="required,minlength=1" t:value="user" size="30" /> <br /> - ${message:password} : + ${message:simexplorer.ui.web.password} : <input t:type="PasswordField" t:id="password" t:validate="required,minlength=1" t:value="password" size="30" /> <br /> - <input t:type="Submit" t:value="message:login" /> + <input t:type="Submit" t:value="${message:simexplorer.ui.web.login}" /> </t:form> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -4,7 +4,7 @@ <t:form> <t:errors /> - <p>${message:name} : <t:if test="creating"> + <p>${message:simexplorer.ui.web.name} : <t:if test="creating"> <input t:type="TextField" t:id="login" t:validate="required,minlength=4" t:value="user.login" size="40" /> <t:parameter name="else"> @@ -21,25 +21,26 @@ <p><t:label for="isSuperAdmin" />: <input t:type="checkbox" t:id="isSuperAdmin" t:value="user.superAdmin" /></p> - <p>${message:password} : <a t:type="ActionLink" - t:id="resetPassword" t:context="user.id">${message:resetPassword}</a> + <p>${message:simexplorer.ui.web.password} : <a t:type="ActionLink" + t:id="resetPassword" t:context="user.id">${message:simexplorer.ui.web.resetPassword}</a> </p> - <p>${message:memberOf} : <input t:type="Palette" model="groups" - selected="groupsOfUser" encoder="groupEncoder" /></p> + <p>${message:simexplorer.ui.web.memberOf} : <input + t:type="Palette" model="groups" selected="groupsOfUser" + encoder="groupEncoder" /></p> - <p>${message:ownerOf} : + <p>${message:simexplorer.ui.web.ownerOf} : <table t:type="Grid" source="ownedGroups" row="group" model="groupModel"> <t:parameter name="empty"> - ${message:none} + ${message:simexplorer.ui.web.none} </t:parameter> </table> </p> - <input t:type="Submit" t:value="message:submit" /> - <a t:type="actionlink" t:id="cancel">${message:cancel}</a> + <input t:type="Submit" t:value="${message:simexplorer.ui.web.submit}" /> + <a t:type="actionlink" t:id="cancel">${message:simexplorer.ui.web.cancel}</a> </t:form> </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/UserList.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/UserList.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/UserList.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -1,16 +1,16 @@ <t:layout xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" title="${windowtitle}"> - - + + <table t:type="Grid" source="users" row="user" model="model"> <t:parameter name="editCell"> - <t:actionlink t:id="edit" context="user.id">${message:modify}</t:actionlink> + <t:actionlink t:id="edit" context="user.id">${message:simexplorer.ui.web.modify}</t:actionlink> </t:parameter> <t:parameter name="deleteCell"> - <t:actionlink t:id="delete" context="user.id">${message:delete}</t:actionlink> + <t:actionlink t:id="delete" context="user.id">${message:simexplorer.ui.web.delete}</t:actionlink> </t:parameter> </table> - - <t:actionlink t:id="add">${message:adduser}</t:actionlink> - + + <t:actionlink t:id="add">${message:simexplorer.ui.web.adduser}</t:actionlink> + </t:layout> Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 12:18:09 UTC (rev 684) @@ -1,112 +1,119 @@ -simexplorer.service.security.norights=simexplorer.service.security.norights -simexplorer.ui.web.= -simexplorer.ui.web.actions=simexplorer.ui.web.actions -simexplorer.ui.web.applicationexploration=simexplorer.ui.web.applicationexploration -simexplorer.ui.web.code=simexplorer.ui.web.code -simexplorer.ui.web.codes=simexplorer.ui.web.codes -simexplorer.ui.web.component=simexplorer.ui.web.component -simexplorer.ui.web.components=simexplorer.ui.web.components -simexplorer.ui.web.constant=simexplorer.ui.web.constant -simexplorer.ui.web.date=simexplorer.ui.web.date -simexplorer.ui.web.description=simexplorer.ui.web.description -simexplorer.ui.web.explorationdata=simexplorer.ui.web.explorationdata -simexplorer.ui.web.explorations=simexplorer.ui.web.explorations -simexplorer.ui.web.hash=simexplorer.ui.web.hash -simexplorer.ui.web.history=simexplorer.ui.web.history -simexplorer.ui.web.language=simexplorer.ui.web.language -simexplorer.ui.web.libraries=simexplorer.ui.web.libraries -simexplorer.ui.web.library=simexplorer.ui.web.library -simexplorer.ui.web.name=simexplorer.ui.web.name -simexplorer.ui.web.result=simexplorer.ui.web.result -simexplorer.ui.web.rights.action=simexplorer.ui.web.rights.action -simexplorer.ui.web.structure=simexplorer.ui.web.structure -simexplorer.ui.web.structures=simexplorer.ui.web.structures -simexplorer.ui.web.title.applicationlist=simexplorer.ui.web.title.applicationlist -simexplorer.ui.web.title.deleteelement=simexplorer.ui.web.title.deleteelement -simexplorer.ui.web.title.elementdetail=simexplorer.ui.web.title.elementdetail -simexplorer.ui.web.title.elementexport=simexplorer.ui.web.title.elementexport -simexplorer.ui.web.title.elementhistory=simexplorer.ui.web.title.elementhistory -simexplorer.ui.web.title.elementimport=simexplorer.ui.web.title.elementimport -simexplorer.ui.web.title.elementrights=simexplorer.ui.web.title.elementrights -simexplorer.ui.web.title.groupedit=simexplorer.ui.web.title.groupedit -simexplorer.ui.web.title.grouplist=simexplorer.ui.web.title.grouplist -simexplorer.ui.web.title.install=simexplorer.ui.web.title.install -simexplorer.ui.web.title.login=simexplorer.ui.web.title.login -simexplorer.ui.web.title.pageerror=simexplorer.ui.web.title.pageerror -simexplorer.ui.web.title.searchresults=simexplorer.ui.web.title.searchresults -simexplorer.ui.web.title.useredit=simexplorer.ui.web.title.useredit -simexplorer.ui.web.title.userlist=simexplorer.ui.web.title.userlist -simexplorer.ui.web.type=simexplorer.ui.web.type -simexplorer.ui.web.value=simexplorer.ui.web.value -simexplorer.ui.web.values=simexplorer.ui.web.values -simexplorer.ui.web.version=simexplorer.ui.web.version +simexplorer.service.security.norights=Not enough rights to perform that action +simexplorer.ui.web.actions=Actions +simexplorer.ui.web.applicationexploration=Application exploration +simexplorer.ui.web.code=Code +simexplorer.ui.web.codes=Codes +simexplorer.ui.web.component=Component +simexplorer.ui.web.components=Components +simexplorer.ui.web.constant=Constant +simexplorer.ui.web.date=Date +simexplorer.ui.web.delete.action=Delete +simexplorer.ui.web.details.action=Details +simexplorer.ui.web.description=Description +simexplorer.ui.web.explorationdata=Data exploration +simexplorer.ui.web.explorations=Explorations +simexplorer.ui.web.export.action=Export +simexplorer.ui.web.hash=Hash +simexplorer.ui.web.history=History +simexplorer.ui.web.history.action=History +simexplorer.ui.web.language=Language +simexplorer.ui.web.libraries=Libraries +simexplorer.ui.web.library=Library +simexplorer.ui.web.name=Name +simexplorer.ui.web.result=Result +simexplorer.ui.web.rights.action=Action +simexplorer.ui.web.structure=Structure +simexplorer.ui.web.structures=Structures +simexplorer.ui.web.title.applicationlist=Application list +simexplorer.ui.web.title.deleteelement=Delete element +simexplorer.ui.web.title.elementdetail=Element detail +simexplorer.ui.web.title.elementexport=Element export +simexplorer.ui.web.title.elementhistory=Element history +simexplorer.ui.web.title.elementimport=Element import +simexplorer.ui.web.title.elementrights=Element rights +simexplorer.ui.web.title.groupedit=Group edit +simexplorer.ui.web.title.grouplist=Group list +simexplorer.ui.web.title.install=Install +simexplorer.ui.web.title.login=Login +simexplorer.ui.web.title.pageerror=Error +simexplorer.ui.web.title.searchresults=Search results +simexplorer.ui.web.title.useredit=User edit +simexplorer.ui.web.title.userlist=User list +simexplorer.ui.web.type=Type +simexplorer.ui.web.value=Value +simexplorer.ui.web.values=Values +simexplorer.ui.web.version=Version -layout-install=Generate data -generatedata=Generate data +simexplorer.ui.web.layout.pagetitle=Simexplorer SI -explorationapplication=Exploration application -library=Library +simexplorer.ui.web.layout.menutitle=Menu +simexplorer.ui.web.layout.applications=Applications +simexplorer.ui.web.layout.list=List +simexplorer.ui.web.layout.import=Import -back=Back -cancel=Cancel -confirm=Confirm -submit=Submit -modify=Modify -delete=Delete -add=Add -remove=Remove -login=Login -upload=Upload +simexplorer.ui.web.layout.administration=Administration +simexplorer.ui.web.layout.userlist=Users +simexplorer.ui.web.layout.grouplist=Groups -confirmdelete=Confirm delete? -confirmdeleteAll=Confirm delete all versions? -resetPassword=Reset password +simexplorer.ui.web.layout.search=Search -name=Name -user=User -password=Password -firstname=First name -mail=Mail -properties=Properties +simexplorer.ui.web.layout.localeen=English +simexplorer.ui.web.layout.localefr=Français -groups=Groups +simexplorer.ui.web.layout.logout=Logout -userMembers=User members -groupMembers=Group members +simexplorer.ui.web.layout.copyright=Copyright © 2008. Cemagref - GPL -addgroup=Add group -adduser=Add user +simexplorer.ui.web.layout.install=Generate data -memberOf=Member of -ownerOf=Owner of -none=None -owner=Owner -read=Read -write=Write -admin=Admin -users=Users +simexplorer.ui.web.back=Back +simexplorer.ui.web.cancel=Cancel +simexplorer.ui.web.confirm=Confirm +simexplorer.ui.web.submit=Submit +simexplorer.ui.web.modify=Modify +simexplorer.ui.web.delete=Delete +simexplorer.ui.web.add=Add +simexplorer.ui.web.remove=Remove +simexplorer.ui.web.login=Login +simexplorer.ui.web.upload=Upload +simexplorer.ui.web.addgroup=Add group +simexplorer.ui.web.adduser=Add user -downloadxml=Download XML -noAttachment=No attachment -attachments=Attachments +simexplorer.ui.web.name=Name +simexplorer.ui.web.user=User +simexplorer.ui.web.password=Password +simexplorer.ui.web.mail=Mail -layout-windowtitle=Simexplorer SI -layout-pagetitle=Simexplorer SI +simexplorer.ui.web.userMembers=User members +simexplorer.ui.web.groupMembers=Group members -layout-menutitle=Menu -layout-applications=Applications -layout-list=List -layout-import=Import +simexplorer.ui.web.memberOf=Member of +simexplorer.ui.web.ownerOf=Owner of +simexplorer.ui.web.none=None +simexplorer.ui.web.resetPassword=Reset password -layout-administration=Administration -layout-userlist=User list -layout-grouplist=Group list +simexplorer.ui.web.delete.confirmdelete=Confirm deletion of element +simexplorer.ui.web.delete.confirmdeleteAll=Confirm deletion of element in all versions -layout-localeen=English -layout-localefr=Français +simexplorer.ui.web.export.downloadxml=Download XML +simexplorer.ui.web.export.downloadfull=Download XML and all attachments as ZIP archive +simexplorer.ui.web.export.noAttachment=No attachment +simexplorer.ui.web.export.attachments=Attachments -layout-logout=Logout +simexplorer.ui.web.import.explorationapplication=Exploration application +simexplorer.ui.web.import.library=Library -layout-copyright=Copyright © 2008. Cemagref - GPL +simexplorer.ui.web.elementlist.details=Details -search=Search +simexplorer.ui.web.rights.properties=Properties +simexplorer.ui.web.rights.owner=Owner +simexplorer.ui.web.rights.read=Read +simexplorer.ui.web.rights.write=Write +simexplorer.ui.web.rights.admin=Admin +simexplorer.ui.web.rights.groups=Groups +simexplorer.ui.web.rights.users=Users + +simexplorer.ui.web.error.unknowException=Unknown exception +simexplorer.ui.web.error.errorMessage=An unknown error occured. + +simexplorer.ui.web.generatedata=Generate data Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-05 12:18:09 UTC (rev 684) @@ -1,112 +1,119 @@ -simexplorer.service.security.norights=simexplorer.service.security.norights -simexplorer.ui.web.= -simexplorer.ui.web.actions=simexplorer.ui.web.actions -simexplorer.ui.web.applicationexploration=simexplorer.ui.web.applicationexploration -simexplorer.ui.web.code=simexplorer.ui.web.code -simexplorer.ui.web.codes=simexplorer.ui.web.codes -simexplorer.ui.web.component=simexplorer.ui.web.component -simexplorer.ui.web.components=simexplorer.ui.web.components -simexplorer.ui.web.constant=simexplorer.ui.web.constant -simexplorer.ui.web.date=simexplorer.ui.web.date -simexplorer.ui.web.description=simexplorer.ui.web.description -simexplorer.ui.web.explorationdata=simexplorer.ui.web.explorationdata -simexplorer.ui.web.explorations=simexplorer.ui.web.explorations -simexplorer.ui.web.hash=simexplorer.ui.web.hash -simexplorer.ui.web.history=simexplorer.ui.web.history -simexplorer.ui.web.language=simexplorer.ui.web.language -simexplorer.ui.web.libraries=simexplorer.ui.web.libraries -simexplorer.ui.web.library=simexplorer.ui.web.library -simexplorer.ui.web.name=simexplorer.ui.web.name -simexplorer.ui.web.result=simexplorer.ui.web.result -simexplorer.ui.web.rights.action=simexplorer.ui.web.rights.action -simexplorer.ui.web.structure=simexplorer.ui.web.structure -simexplorer.ui.web.structures=simexplorer.ui.web.structures -simexplorer.ui.web.title.applicationlist=simexplorer.ui.web.title.applicationlist -simexplorer.ui.web.title.deleteelement=simexplorer.ui.web.title.deleteelement -simexplorer.ui.web.title.elementdetail=simexplorer.ui.web.title.elementdetail -simexplorer.ui.web.title.elementexport=simexplorer.ui.web.title.elementexport -simexplorer.ui.web.title.elementhistory=simexplorer.ui.web.title.elementhistory -simexplorer.ui.web.title.elementimport=simexplorer.ui.web.title.elementimport -simexplorer.ui.web.title.elementrights=simexplorer.ui.web.title.elementrights -simexplorer.ui.web.title.groupedit=simexplorer.ui.web.title.groupedit -simexplorer.ui.web.title.grouplist=simexplorer.ui.web.title.grouplist -simexplorer.ui.web.title.install=simexplorer.ui.web.title.install -simexplorer.ui.web.title.login=simexplorer.ui.web.title.login -simexplorer.ui.web.title.pageerror=simexplorer.ui.web.title.pageerror -simexplorer.ui.web.title.searchresults=simexplorer.ui.web.title.searchresults -simexplorer.ui.web.title.useredit=simexplorer.ui.web.title.useredit -simexplorer.ui.web.title.userlist=simexplorer.ui.web.title.userlist -simexplorer.ui.web.type=simexplorer.ui.web.type -simexplorer.ui.web.value=simexplorer.ui.web.value -simexplorer.ui.web.values=simexplorer.ui.web.values -simexplorer.ui.web.version=simexplorer.ui.web.version +simexplorer.service.security.norights=Vous n'avez pas les droits suffisants pour executer cette action. +simexplorer.ui.web.actions=Actions +simexplorer.ui.web.applicationexploration=Application d'exploration +simexplorer.ui.web.code=Code +simexplorer.ui.web.codes=Codes +simexplorer.ui.web.component=Composant +simexplorer.ui.web.components=Composants +simexplorer.ui.web.constant=Constante +simexplorer.ui.web.date=Date +simexplorer.ui.web.delete.action=Supprimer +simexplorer.ui.web.details.action=Details +simexplorer.ui.web.description=Description +simexplorer.ui.web.explorationdata=Données d'exploration +simexplorer.ui.web.explorations=Explorations +simexplorer.ui.web.export.action=Exporter +simexplorer.ui.web.hash=Hash +simexplorer.ui.web.history=Historique +simexplorer.ui.web.history.action=Historique +simexplorer.ui.web.language=Langage +simexplorer.ui.web.libraries=Librairies +simexplorer.ui.web.library=Librairie +simexplorer.ui.web.name=Nom +simexplorer.ui.web.rights.action=Droits +simexplorer.ui.web.result=Résultat +simexplorer.ui.web.structure=Structure +simexplorer.ui.web.structures=Structures +simexplorer.ui.web.title.applicationlist=Liste des applications +simexplorer.ui.web.title.deleteelement=Suppression d'un élément +simexplorer.ui.web.title.elementdetail=Détail d'un élément +simexplorer.ui.web.title.elementexport=Export d'un élément +simexplorer.ui.web.title.elementhistory=Historique d'un élément +simexplorer.ui.web.title.elementimport=Import d'un élément +simexplorer.ui.web.title.elementrights=Droits sur un élément +simexplorer.ui.web.title.groupedit=Edition d'un groupe +simexplorer.ui.web.title.grouplist=Liste des groupes +simexplorer.ui.web.title.install=Installation +simexplorer.ui.web.title.login=Login +simexplorer.ui.web.title.pageerror=Erreur +simexplorer.ui.web.title.searchresults=Résultats de la recherche +simexplorer.ui.web.title.useredit=Edition d'un utilisateur +simexplorer.ui.web.title.userlist=Liste des utilisateurs +simexplorer.ui.web.type=Type +simexplorer.ui.web.value=Valeur +simexplorer.ui.web.values=Valeurs +simexplorer.ui.web.version=Versions -layout-install=Generate data -generatedata=Generate data +simexplorer.ui.web.layout.pagetitle=Simexplorer SI -explorationapplication=Exploration application -library=Library +simexplorer.ui.web.layout.menutitle=Menu +simexplorer.ui.web.layout.applications=Applications +simexplorer.ui.web.layout.list=Liste +simexplorer.ui.web.layout.import=Import -back=Back -cancel=Cancel -confirm=Confirm -submit=Submit -modify=Modify -delete=Delete -add=Add -remove=Remove -login=Login -upload=Upload +simexplorer.ui.web.layout.administration=Administration +simexplorer.ui.web.layout.userlist=Utilisateurs +simexplorer.ui.web.layout.grouplist=Groupes -confirmdelete=Confirm delete? -confirmdeleteAll=Confirm delete all versions? -resetPassword=Reset password +simexplorer.ui.web.layout.search=Rechercher -name=Name -user=Utilisateur -password=Mot de passe -firstname=First name -mail=Mail -properties=Properties +simexplorer.ui.web.layout.localeen=English +simexplorer.ui.web.layout.localefr=Français -groups=Groups +simexplorer.ui.web.layout.logout=Déconnexion -userMembers=User members -groupMembers=Group members +simexplorer.ui.web.layout.copyright=Copyright © 2008. Cemagref - GPL -addgroup=Add group -adduser=Add user +simexplorer.ui.web.layout.install=Générer des données -memberOf=Member of -ownerOf=Owner of -none=None -owner=Owner -read=Read -write=Write -admin=Admin -users=Users +simexplorer.ui.web.back=Retour +simexplorer.ui.web.cancel=Annuler +simexplorer.ui.web.confirm=Confirmer +simexplorer.ui.web.submit=Soumettre +simexplorer.ui.web.modify=Modifier +simexplorer.ui.web.delete=Supprimer +simexplorer.ui.web.add=Ajouter +simexplorer.ui.web.remove=Enlever +simexplorer.ui.web.login=Login +simexplorer.ui.web.upload=Upload +simexplorer.ui.web.addgroup=Ajouter un groupe +simexplorer.ui.web.adduser=Ajouter un utilisateur -downloadxml=Download XML -noAttachment=No attachment -attachments=Attachments +simexplorer.ui.web.name=Nom +simexplorer.ui.web.user=Utilisateur +simexplorer.ui.web.password=Mot de passe +simexplorer.ui.web.mail=Mail -layout-windowtitle=Simexplorer SI -layout-pagetitle=Simexplorer SI +simexplorer.ui.web.userMembers=Utilisateur membres +simexplorer.ui.web.groupMembers=Groupes membres -layout-menutitle=Menu -layout-applications=Applications -layout-list=List -layout-import=Import +simexplorer.ui.web.memberOf=Membre de +simexplorer.ui.web.ownerOf=Propriétaire des groupes +simexplorer.ui.web.none=Aucun +simexplorer.ui.web.resetPassword=Réinitialiser le mot de passe -layout-administration=Administration -layout-userlist=User list -layout-grouplist=Group list +simexplorer.ui.web.delete.confirmdelete=Confirmer la suppression de l'élément +simexplorer.ui.web.delete.confirmdeleteAll=Confirmer la suppression de l'élément dans toutes ses versions -layout-localeen=English -layout-localefr=Français +simexplorer.ui.web.export.downloadxml=Télécharger le fichier XML +simexplorer.ui.web.export.downloadfull=Télécharger le fichier XML et tous ces fichiers dans une archive ZIP +simexplorer.ui.web.export.noAttachment=Sans fichier +simexplorer.ui.web.export.attachments=Fichiers -layout-logout=Logout +simexplorer.ui.web.import.explorationapplication=Application d'exploration +simexplorer.ui.web.import.library=Librairie -layout-copyright=Copyright © 2008. Cemagref - GPL +simexplorer.ui.web.elementlist.details=Details -search=Search +simexplorer.ui.web.rights.properties=Propriétés +simexplorer.ui.web.rights.owner=Propriétaires +simexplorer.ui.web.rights.read=Lecture +simexplorer.ui.web.rights.write=Ecriture +simexplorer.ui.web.rights.admin=Administration +simexplorer.ui.web.rights.groups=Groupes +simexplorer.ui.web.rights.users=Utilisateurs + +simexplorer.ui.web.error.unknowException=Exception inconnue +simexplorer.ui.web.error.errorMessage=Une erreur inconnue s'est produite. + +simexplorer.ui.web.generatedata=Generate data Modified: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml 2008-02-05 10:28:34 UTC (rev 683) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.tml 2008-02-05 12:18:09 UTC (rev 684) @@ -6,49 +6,49 @@ <body>  -<h1 id="Title">${message:layout-pagetitle}</h1> +<h1 id="Title">${message:simexplorer.ui.web.layout.pagetitle}</h1>  <div id="Header"> -<div class="Left">[<a t:type="actionlink" t:id="switchLocaleEn">${message:layout-localeen}</a>] -- [<a t:type="actionlink" t:id="switchLocaleFr">${message:layout-localefr}</a>] +<div class="Left">[<a t:type="actionlink" t:id="switchLocaleEn">${message:simexplorer.ui.web.layout.localeen}</a>] +- [<a t:type="actionlink" t:id="switchLocaleFr">${message:simexplorer.ui.web.layout.localefr}</a>] </div> <t:if test="logged"> <div class="Right">${loginName} [<a t:type="actionlink" - t:id="logout">${message:layout-logout}</a>]</div> + t:id="logout">${message:simexplorer.ui.web.layout.logout}</a>]</div> </t:if></div> <t:if test="logged"> <div id="Menu" class=""> - <h1 class="tab">${message:layout-menutitle}</h1> + <h1 class="tab">${message:simexplorer.ui.web.layout.menutitle}</h1> <div id="tabMenu"> - <h2 class="Title">${message:layout-applications}</h2> + <h2 class="Title">${message:simexplorer.ui.web.layout.applications}</h2> <menu class="menu"> - <li><t:actionlink t:id="applicationList">${message:layout-list}</t:actionlink> + <li><t:actionlink t:id="applicationList">${message:simexplorer.ui.web.layout.list}</t:actionlink> </li> - <li><t:pagelink page="ElementImport">${message:layout-import}</t:pagelink></li> + <li><t:pagelink page="ElementImport">${message:simexplorer.ui.web.layout.import}</t:pagelink></li> </menu> <t:if test="administrator"> - <h2 class="Title">${message:layout-administration}</h2> + <h2 class="Title">${message:simexplorer.ui.web.layout.administration}</h2> <menu class="menu"> - <li><t:pagelink page="UserList">${message:layout-userlist}</t:pagelink></li> - <li><t:pagelink page="GroupList">${message:layout-grouplist}</t:pagelink></li> + <li><t:pagelink page="UserList">${message:simexplorer.ui.web.layout.userlist}</t:pagelink></li> + <li><t:pagelink page="GroupList">${message:simexplorer.ui.web.layout.grouplist}</t:pagelink></li> </menu> </t:if></div>  - <h1 class="tab">${message:search}</h1> + <h1 class="tab">${message:simexplorer.ui.web.layout.search}</h1> <div id="tabMenu"><t:form> <t:errors /> <h2 class="Title"><t:label for="searchField" />:</h2> <input t:type="TextField" t:id="searchField" t:value="searchText" t:validate="required,minlength=3" size="30" /> - <input type="submit" value="${message:search}" /> + <input type="submit" value="${message:simexplorer.ui.web.layout.search}" /> </t:form></div> </div> @@ -57,6 +57,6 @@ <div id="Content"> <t:body /></div> -<div id="FooterAdd">${message:layout-copyright}</div> +<div id="FooterAdd">${message:simexplorer.ui.web.layout.copyright}</div> </body> </html> \ No newline at end of file

1 0

r683 - in trunk/simexplorer-is-web/src: java/fr/cemagref/simexplorer/is/ui/web/components java/fr/cemagref/simexplorer/is/ui/web/pages java/fr/cemagref/simexplorer/is/ui/web/pages/security java/fr/cemagref/simexplorer/is/ui/web/services main/webapp/WEB-INF resources/i18n
by glandais＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: glandais Date: 2008-02-05 10:28:34 +0000 (Tue, 05 Feb 2008) New Revision: 683 Added: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Removed: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-en_GB.properties trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-fr_FR.properties Log: Using Tapestry localization (handle sessions) Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/components/Layout.java 2008-02-05 10:28:34 UTC (rev 683) @@ -93,7 +93,7 @@ * @return the object */ Object onActionFromSwitchLocaleFr() { - persistentLocale.set(new Locale("fr_FR")); + persistentLocale.set(Locale.FRANCE); return null; } @@ -103,7 +103,7 @@ * @return the object */ Object onActionFromSwitchLocaleEn() { - persistentLocale.set(new Locale("en_GB")); + persistentLocale.set(Locale.UK); return null; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDelete.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import org.apache.tapestry.annotations.InjectPage; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; @@ -70,7 +68,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.deleteelement"); + return getMessages().get("simexplorer.ui.web.title.deleteelement"); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -44,7 +42,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.elementdetail"); + return getMessages().get("simexplorer.ui.web.title.elementdetail"); } /** @@ -54,10 +52,10 @@ */ public List<String> getHeaders() { List<String> result = new ArrayList<String>(); - result.add(_("simexplorer.ui.web.type")); - result.add(_("simexplorer.ui.web.name")); - result.add(_("simexplorer.ui.web.version")); - result.add(_("simexplorer.ui.web.actions")); + result.add(getMessages().get("simexplorer.ui.web.type")); + result.add(getMessages().get("simexplorer.ui.web.name")); + result.add(getMessages().get("simexplorer.ui.web.version")); + result.add(getMessages().get("simexplorer.ui.web.actions")); return result; } @@ -122,25 +120,27 @@ node.setType(TreeNode.TYPE_FOLDER); - node.setColumns(generateStringArray( - _("simexplorer.ui.web.applicationexploration"), getMetadata() - .getName(), getElement().getMetaData().getVersion() - .toString(), getElement().getMetaData(), true, - "export", "history", "delete")); + node + .setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.applicationexploration"), + getMetadata().getName(), getElement().getMetaData() + .getVersion().toString(), getElement() + .getMetaData(), true, "export", "history", + "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); - node1.setColumns(generateStringArray( - _("simexplorer.ui.web.components"), "", "")); + node1.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.components"), "", "")); node1 .setChildren(generateComponents((ExplorationApplication) getElement())); children.add(node1); TreeNode node2 = new TreeNode(); node2.setType(TreeNode.TYPE_FOLDER); - node2.setColumns(generateStringArray( - _("simexplorer.ui.web.explorations"), "", "")); + node2.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.explorations"), "", "")); node2 .setChildren(generateExplorations((ExplorationApplication) getElement())); children.add(node2); @@ -178,11 +178,11 @@ TreeNode explorationDataNode = new TreeNode(); explorationDataNode.setType(TreeNode.TYPE_FOLDER); - explorationDataNode.setColumns(generateStringArray( - _("simexplorer.ui.web.explorationdata"), explorationData - .getMetaData().getName(), explorationData.getMetaData() - .getVersion().toString(), - explorationData.getMetaData(), true, "history", "delete")); + explorationDataNode.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.explorationdata"), explorationData + .getMetaData().getName(), explorationData.getMetaData() + .getVersion().toString(), explorationData.getMetaData(), true, + "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); @@ -190,9 +190,10 @@ TreeNode node1 = new TreeNode(); node1.setType(TreeNode.TYPE_FOLDER); - node1.setColumns(generateStringArray(_("simexplorer.ui.web.values"), - generateHeader(_("simexplorer.ui.web.type")), - generateHeader(_("simexplorer.ui.web.value")))); + node1.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.values"), generateHeader(getMessages().get( + "simexplorer.ui.web.type")), generateHeader(getMessages().get( + "simexplorer.ui.web.value")))); node1.setChildren(generateValues(explorationData)); children.add(node1); @@ -235,8 +236,9 @@ TreeNode res = new TreeNode(); res.setType(TreeNode.TYPE_DOCUMENT); - res.setColumns(generateStringArray(_("simexplorer.ui.web.result"), "", - "", explorationData.getMetaData(), false, "export")); + res.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.result"), "", "", explorationData + .getMetaData(), false, "export")); return res; } @@ -283,42 +285,43 @@ TreeNode componentNode = new TreeNode(); componentNode.setType(TreeNode.TYPE_FOLDER); - componentNode.setColumns(generateStringArray( - _("simexplorer.ui.web.component"), component.getMetaData() - .getName(), component.getMetaData().getVersion() - .toString(), component.getMetaData(), true, "history", - "delete")); + componentNode.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.component"), component.getMetaData() + .getName(), component.getMetaData().getVersion().toString(), + component.getMetaData(), true, "history", "delete")); List<TreeNode> children = new ArrayList<TreeNode>(); TreeNode node; node = initNode(); - node.setColumns(generateStringArray(_("simexplorer.ui.web.constant"), - generateHeader(_("simexplorer.ui.web.name")), - generateHeader(_("simexplorer.ui.web.type")))); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.constant"), generateHeader(getMessages() + .get("simexplorer.ui.web.name")), generateHeader(getMessages() + .get("simexplorer.ui.web.type")))); node.setChildren(generateConstants(component.getConstants())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(_("simexplorer.ui.web.structures"), - "", "")); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.structures"), "", "")); node.setChildren(generateStructures(component.getStructures())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(_("simexplorer.ui.web.codes"), - generateHeader(_("simexplorer.ui.web.language")), - generateHeader(_("simexplorer.ui.web.code")))); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.codes"), generateHeader(getMessages().get( + "simexplorer.ui.web.language")), generateHeader(getMessages() + .get("simexplorer.ui.web.code")))); node.setChildren(generateCodes(component.getCodes())); children.add(node); node = initNode(); - node.setColumns(generateStringArray(_("simexplorer.ui.web.libraries"), - "", "")); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.libraries"), "", "")); node.setChildren(generateLibraries(component)); children.add(node); @@ -358,10 +361,10 @@ private TreeNode generateLibrary(Library library) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(_("simexplorer.ui.web.library"), - library.getMetaData().getName(), library.getMetaData() - .getVersion().toString(), library.getMetaData(), true, - "export")); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.library"), library.getMetaData().getName(), + library.getMetaData().getVersion().toString(), library + .getMetaData(), true, "export")); return node; } @@ -378,8 +381,9 @@ for (Code code : codes) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray(_("simexplorer.ui.web.code"), - code.getLanguage(), code.getCode())); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.code"), code.getLanguage(), code + .getCode())); res.add(node); } return res; @@ -399,8 +403,8 @@ for (Structure structure : structures) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray( - _("simexplorer.ui.web.structure"), "", "")); + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.structure"), "", "")); res.add(node); } return res; @@ -419,8 +423,8 @@ for (Constant constant : constants) { TreeNode node = new TreeNode(); node.setType(TreeNode.TYPE_DOCUMENT); - node.setColumns(generateStringArray( - _("simexplorer.ui.web.constant"), constant.getName(), + node.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.constant"), constant.getName(), constant.getType().getSimpleName())); res.add(node); } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.io.InputStream; import java.util.ArrayList; import java.util.List; @@ -54,7 +52,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.elementexport"); + return getMessages().get("simexplorer.ui.web.title.elementexport"); } /** @@ -142,9 +140,9 @@ */ public List<String> getHeaders() { List<String> result = new ArrayList<String>(); - result.add(_("simexplorer.ui.web.type")); - result.add(_("simexplorer.ui.web.name")); - result.add(_("simexplorer.ui.web.hash")); + result.add(getMessages().get("simexplorer.ui.web.type")); + result.add(getMessages().get("simexplorer.ui.web.name")); + result.add(getMessages().get("simexplorer.ui.web.hash")); result.add(""); return result; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementHistory.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; @@ -74,7 +72,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.elementhistory"); + return getMessages().get("simexplorer.ui.web.title.elementhistory"); } /** @@ -84,9 +82,9 @@ */ public List<String> getHeaders() { List<String> result = new ArrayList<String>(); - result.add(_("simexplorer.ui.web.version")); - result.add(_("simexplorer.ui.web.description")); - result.add(_("simexplorer.ui.web.date")); + result.add(getMessages().get("simexplorer.ui.web.version")); + result.add(getMessages().get("simexplorer.ui.web.description")); + result.add(getMessages().get("simexplorer.ui.web.date")); return result; } @@ -110,8 +108,8 @@ Arrays.sort(versions, new MetadataVersionComparator()); TreeNode rootNode = new TreeNode(); rootNode.setType(TreeNode.TYPE_FOLDER); - rootNode - .setColumns(generateStringArray(_("simexplorer.ui.web.history"))); + rootNode.setColumns(generateStringArray(getMessages().get( + "simexplorer.ui.web.history"))); rootNode.setObject(new Version("")); rootNode.setChildren(new ArrayList<TreeNode>()); for (MetaData mde : versions) { Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementImport.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import org.apache.tapestry.upload.services.UploadedFile; import com.healthmarketscience.rmiio.RemoteInputStreamServer; @@ -73,7 +71,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.elementimport"); + return getMessages().get("simexplorer.ui.web.title.elementimport"); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -157,9 +155,12 @@ String title; if (elementDataSource.getQuery() != null && !elementDataSource.getQuery().equals("")) { - title = _("simexplorer.ui.web.title.searchresults",elementDataSource.getQuery()); + title = getMessages().format( + "simexplorer.ui.web.title.searchresults", + elementDataSource.getQuery()); } else { - title = _("simexplorer.ui.web.title.applicationlist"); + title = getMessages().get( + "simexplorer.ui.web.title.applicationlist"); } return title; } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementPageDetail.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; @@ -200,13 +198,14 @@ String res; for (String anAction : actions) { sb.append("<br>"); - sb.append(generateString(_("simexplorer.ui.web." + anAction - + ".action"), anAction, element)); + sb.append(generateString(getMessages().get( + "simexplorer.ui.web." + anAction + ".action"), anAction, + element)); } if (security) { sb.append("<br>"); - sb.append(generateString(_("simexplorer.ui.web.rights.action"), - "rights", element)); + sb.append(generateString(getMessages().get( + "simexplorer.ui.web.rights.action"), "rights", element)); } res = sb.substring(4); Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementRights.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -54,7 +52,7 @@ /** The owner users. */ @Persist private List<User> ownerUsers; - + /** The owner groups. */ @Persist private List<Group> ownerGroups; @@ -62,7 +60,7 @@ /** The read users. */ @Persist private List<User> readUsers; - + /** The read groups. */ @Persist private List<Group> readGroups; @@ -70,7 +68,7 @@ /** The write users. */ @Persist private List<User> writeUsers; - + /** The write groups. */ @Persist private List<Group> writeGroups; @@ -78,7 +76,7 @@ /** The admin users. */ @Persist private List<User> adminUsers; - + /** The admin groups. */ @Persist private List<Group> adminGroups; @@ -92,7 +90,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.elementrights"); + return getMessages().get("simexplorer.ui.web.title.elementrights"); } /* (non-Javadoc) Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ExceptionReport.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,10 +17,9 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.List; +import org.apache.tapestry.ioc.Messages; import org.apache.tapestry.ioc.annotations.Inject; import org.apache.tapestry.ioc.services.ExceptionAnalysis; import org.apache.tapestry.ioc.services.ExceptionAnalyzer; @@ -64,13 +63,17 @@ @Inject private ExceptionAnalyzer analyzer; + /** The messages. */ + @Inject + private Messages messages; + /** * Gets the window title. * * @return the window title */ public String getWindowTitle() { - return _("simexplorer.ui.web.title.pageerror"); + return messages.get("simexplorer.ui.web.title.pageerror"); } /* (non-Javadoc) Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupEdit.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -70,7 +68,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.groupedit"); + return getMessages().get("simexplorer.ui.web.title.groupedit"); } /** Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/GroupList.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.List; @@ -67,7 +65,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.grouplist"); + return getMessages().get("simexplorer.ui.web.title.grouplist"); } /** Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; @@ -59,7 +57,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.install"); + return getMessages().get("simexplorer.ui.web.title.install"); } /** Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,11 +17,11 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.ioc.Messages; +import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; @@ -47,6 +47,10 @@ @ApplicationState private String token; + /** The messages. */ + @Inject + private Messages messages; + /** * On success. * @@ -120,7 +124,7 @@ * @return the window title */ public String getWindowTitle() { - return _("simexplorer.ui.web.title.login"); + return messages.get("simexplorer.ui.web.title.login"); } } Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -33,7 +31,6 @@ import org.apache.tapestry.services.BeanModelSource; import de.hsofttec.t5components.annotations.SetterGetter; - import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; @@ -85,7 +82,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.useredit"); + return getMessages().get("simexplorer.ui.web.title.useredit"); } /** Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserList.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,8 +17,6 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; -import static org.codelutin.i18n.I18n._; - import java.util.ArrayList; import java.util.List; @@ -30,7 +28,6 @@ import org.apache.tapestry.services.BeanModelSource; import de.hsofttec.t5components.annotations.SetterGetter; - import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; @@ -68,7 +65,7 @@ */ @Override public String getWindowTitle() { - return _("simexplorer.ui.web.title.userlist"); + return getMessages().get("simexplorer.ui.web.title.userlist"); } /** Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/security/ProtectedPage.java 2008-02-05 10:28:34 UTC (rev 683) @@ -17,10 +17,10 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages.security; -import static org.codelutin.i18n.I18n._; - import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.ioc.Messages; +import org.apache.tapestry.ioc.annotations.Inject; import fr.cemagref.simexplorer.is.security.entities.User; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; @@ -52,6 +52,10 @@ @Persist private boolean userSuperAdmin; + /** The messages. */ + @Inject + private Messages messages; + /** * On activate. * @@ -62,8 +66,8 @@ if (!userLogged) return "Login"; if (!hasAccessToPage()) - throw new SimExplorerWebException( - _("simexplorer.service.security.norights")); + throw new SimExplorerWebException(messages + .get("simexplorer.service.security.norights")); return null; } @@ -161,4 +165,13 @@ return userSuperAdmin; } + /** + * Gets the messages. + * + * @return the messages + */ + public Messages getMessages() { + return messages; + } + } \ No newline at end of file Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/AppModule.java 2008-02-05 10:28:34 UTC (rev 683) @@ -61,8 +61,7 @@ */ public static void contributeApplicationDefaults( MappedConfiguration<String, String> configuration) { - configuration.add("tapestry.supported-locales", "en_GB"); - configuration.add("tapestry.supported-locales", "fr_FR"); + configuration.add("tapestry.supported-locales", "en,fr"); } /** Deleted: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 10:28:34 UTC (rev 683) @@ -1,69 +0,0 @@ -layout-install=Generate data -generatedata=Generate data - -explorationapplication=Exploration application -library=Library - -back=Back -cancel=Cancel -confirm=Confirm -submit=Submit -modify=Modify -delete=Delete -add=Add -remove=Remove -login=Login -upload=Upload - -confirmdelete=Confirm delete? -confirmdeleteAll=Confirm delete all versions? -resetPassword=Reset password - -name=Name -user=User -password=Password -firstname=First name -mail=Mail -properties=Properties - -groups=Groups - -userMembers=User members -groupMembers=Group members - -addgroup=Add group -adduser=Add user - -memberOf=Member of -ownerOf=Owner of -none=None -owner=Owner -read=Read -write=Write -admin=Admin -users=Users - -downloadxml=Download XML -noAttachment=No attachment -attachments=Attachments - -layout-windowtitle=Simexplorer SI -layout-pagetitle=Simexplorer SI - -layout-menutitle=Menu -layout-applications=Applications -layout-list=List -layout-import=Import - -layout-administration=Administration -layout-userlist=User list -layout-grouplist=Group list - -layout-localeen=English -layout-localefr=Français - -layout-logout=Logout - -layout-copyright=Copyright © 2008. Cemagref - GPL - -search=Search Added: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties (rev 0) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 10:28:34 UTC (rev 683) @@ -0,0 +1,112 @@ +simexplorer.service.security.norights=simexplorer.service.security.norights +simexplorer.ui.web.= +simexplorer.ui.web.actions=simexplorer.ui.web.actions +simexplorer.ui.web.applicationexploration=simexplorer.ui.web.applicationexploration +simexplorer.ui.web.code=simexplorer.ui.web.code +simexplorer.ui.web.codes=simexplorer.ui.web.codes +simexplorer.ui.web.component=simexplorer.ui.web.component +simexplorer.ui.web.components=simexplorer.ui.web.components +simexplorer.ui.web.constant=simexplorer.ui.web.constant +simexplorer.ui.web.date=simexplorer.ui.web.date +simexplorer.ui.web.description=simexplorer.ui.web.description +simexplorer.ui.web.explorationdata=simexplorer.ui.web.explorationdata +simexplorer.ui.web.explorations=simexplorer.ui.web.explorations +simexplorer.ui.web.hash=simexplorer.ui.web.hash +simexplorer.ui.web.history=simexplorer.ui.web.history +simexplorer.ui.web.language=simexplorer.ui.web.language +simexplorer.ui.web.libraries=simexplorer.ui.web.libraries +simexplorer.ui.web.library=simexplorer.ui.web.library +simexplorer.ui.web.name=simexplorer.ui.web.name +simexplorer.ui.web.result=simexplorer.ui.web.result +simexplorer.ui.web.rights.action=simexplorer.ui.web.rights.action +simexplorer.ui.web.structure=simexplorer.ui.web.structure +simexplorer.ui.web.structures=simexplorer.ui.web.structures +simexplorer.ui.web.title.applicationlist=simexplorer.ui.web.title.applicationlist +simexplorer.ui.web.title.deleteelement=simexplorer.ui.web.title.deleteelement +simexplorer.ui.web.title.elementdetail=simexplorer.ui.web.title.elementdetail +simexplorer.ui.web.title.elementexport=simexplorer.ui.web.title.elementexport +simexplorer.ui.web.title.elementhistory=simexplorer.ui.web.title.elementhistory +simexplorer.ui.web.title.elementimport=simexplorer.ui.web.title.elementimport +simexplorer.ui.web.title.elementrights=simexplorer.ui.web.title.elementrights +simexplorer.ui.web.title.groupedit=simexplorer.ui.web.title.groupedit +simexplorer.ui.web.title.grouplist=simexplorer.ui.web.title.grouplist +simexplorer.ui.web.title.install=simexplorer.ui.web.title.install +simexplorer.ui.web.title.login=simexplorer.ui.web.title.login +simexplorer.ui.web.title.pageerror=simexplorer.ui.web.title.pageerror +simexplorer.ui.web.title.searchresults=simexplorer.ui.web.title.searchresults +simexplorer.ui.web.title.useredit=simexplorer.ui.web.title.useredit +simexplorer.ui.web.title.userlist=simexplorer.ui.web.title.userlist +simexplorer.ui.web.type=simexplorer.ui.web.type +simexplorer.ui.web.value=simexplorer.ui.web.value +simexplorer.ui.web.values=simexplorer.ui.web.values +simexplorer.ui.web.version=simexplorer.ui.web.version + +layout-install=Generate data +generatedata=Generate data + +explorationapplication=Exploration application +library=Library + +back=Back +cancel=Cancel +confirm=Confirm +submit=Submit +modify=Modify +delete=Delete +add=Add +remove=Remove +login=Login +upload=Upload + +confirmdelete=Confirm delete? +confirmdeleteAll=Confirm delete all versions? +resetPassword=Reset password + +name=Name +user=User +password=Password +firstname=First name +mail=Mail +properties=Properties + +groups=Groups + +userMembers=User members +groupMembers=Group members + +addgroup=Add group +adduser=Add user + +memberOf=Member of +ownerOf=Owner of +none=None +owner=Owner +read=Read +write=Write +admin=Admin +users=Users + +downloadxml=Download XML +noAttachment=No attachment +attachments=Attachments + +layout-windowtitle=Simexplorer SI +layout-pagetitle=Simexplorer SI + +layout-menutitle=Menu +layout-applications=Applications +layout-list=List +layout-import=Import + +layout-administration=Administration +layout-userlist=User list +layout-grouplist=Group list + +layout-localeen=English +layout-localefr=Français + +layout-logout=Logout + +layout-copyright=Copyright © 2008. Cemagref - GPL + +search=Search Added: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties (rev 0) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-05 10:28:34 UTC (rev 683) @@ -0,0 +1,112 @@ +simexplorer.service.security.norights=simexplorer.service.security.norights +simexplorer.ui.web.= +simexplorer.ui.web.actions=simexplorer.ui.web.actions +simexplorer.ui.web.applicationexploration=simexplorer.ui.web.applicationexploration +simexplorer.ui.web.code=simexplorer.ui.web.code +simexplorer.ui.web.codes=simexplorer.ui.web.codes +simexplorer.ui.web.component=simexplorer.ui.web.component +simexplorer.ui.web.components=simexplorer.ui.web.components +simexplorer.ui.web.constant=simexplorer.ui.web.constant +simexplorer.ui.web.date=simexplorer.ui.web.date +simexplorer.ui.web.description=simexplorer.ui.web.description +simexplorer.ui.web.explorationdata=simexplorer.ui.web.explorationdata +simexplorer.ui.web.explorations=simexplorer.ui.web.explorations +simexplorer.ui.web.hash=simexplorer.ui.web.hash +simexplorer.ui.web.history=simexplorer.ui.web.history +simexplorer.ui.web.language=simexplorer.ui.web.language +simexplorer.ui.web.libraries=simexplorer.ui.web.libraries +simexplorer.ui.web.library=simexplorer.ui.web.library +simexplorer.ui.web.name=simexplorer.ui.web.name +simexplorer.ui.web.result=simexplorer.ui.web.result +simexplorer.ui.web.rights.action=simexplorer.ui.web.rights.action +simexplorer.ui.web.structure=simexplorer.ui.web.structure +simexplorer.ui.web.structures=simexplorer.ui.web.structures +simexplorer.ui.web.title.applicationlist=simexplorer.ui.web.title.applicationlist +simexplorer.ui.web.title.deleteelement=simexplorer.ui.web.title.deleteelement +simexplorer.ui.web.title.elementdetail=simexplorer.ui.web.title.elementdetail +simexplorer.ui.web.title.elementexport=simexplorer.ui.web.title.elementexport +simexplorer.ui.web.title.elementhistory=simexplorer.ui.web.title.elementhistory +simexplorer.ui.web.title.elementimport=simexplorer.ui.web.title.elementimport +simexplorer.ui.web.title.elementrights=simexplorer.ui.web.title.elementrights +simexplorer.ui.web.title.groupedit=simexplorer.ui.web.title.groupedit +simexplorer.ui.web.title.grouplist=simexplorer.ui.web.title.grouplist +simexplorer.ui.web.title.install=simexplorer.ui.web.title.install +simexplorer.ui.web.title.login=simexplorer.ui.web.title.login +simexplorer.ui.web.title.pageerror=simexplorer.ui.web.title.pageerror +simexplorer.ui.web.title.searchresults=simexplorer.ui.web.title.searchresults +simexplorer.ui.web.title.useredit=simexplorer.ui.web.title.useredit +simexplorer.ui.web.title.userlist=simexplorer.ui.web.title.userlist +simexplorer.ui.web.type=simexplorer.ui.web.type +simexplorer.ui.web.value=simexplorer.ui.web.value +simexplorer.ui.web.values=simexplorer.ui.web.values +simexplorer.ui.web.version=simexplorer.ui.web.version + +layout-install=Generate data +generatedata=Generate data + +explorationapplication=Exploration application +library=Library + +back=Back +cancel=Cancel +confirm=Confirm +submit=Submit +modify=Modify +delete=Delete +add=Add +remove=Remove +login=Login +upload=Upload + +confirmdelete=Confirm delete? +confirmdeleteAll=Confirm delete all versions? +resetPassword=Reset password + +name=Name +user=Utilisateur +password=Mot de passe +firstname=First name +mail=Mail +properties=Properties + +groups=Groups + +userMembers=User members +groupMembers=Group members + +addgroup=Add group +adduser=Add user + +memberOf=Member of +ownerOf=Owner of +none=None +owner=Owner +read=Read +write=Write +admin=Admin +users=Users + +downloadxml=Download XML +noAttachment=No attachment +attachments=Attachments + +layout-windowtitle=Simexplorer SI +layout-pagetitle=Simexplorer SI + +layout-menutitle=Menu +layout-applications=Applications +layout-list=List +layout-import=Import + +layout-administration=Administration +layout-userlist=User list +layout-grouplist=Group list + +layout-localeen=English +layout-localefr=Français + +layout-logout=Logout + +layout-copyright=Copyright © 2008. Cemagref - GPL + +search=Search Modified: trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-en_GB.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-en_GB.properties 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-en_GB.properties 2008-02-05 10:28:34 UTC (rev 683) @@ -1,43 +1 @@ -#Mon Feb 04 19:19:33 CET 2008 -simexplorer.service.security.norights=simexplorer.service.security.norights -simexplorer.ui.web.= -simexplorer.ui.web.actions=simexplorer.ui.web.actions -simexplorer.ui.web.applicationexploration=simexplorer.ui.web.applicationexploration -simexplorer.ui.web.code=simexplorer.ui.web.code -simexplorer.ui.web.codes=simexplorer.ui.web.codes -simexplorer.ui.web.component=simexplorer.ui.web.component -simexplorer.ui.web.components=simexplorer.ui.web.components -simexplorer.ui.web.constant=simexplorer.ui.web.constant -simexplorer.ui.web.date=simexplorer.ui.web.date -simexplorer.ui.web.description=simexplorer.ui.web.description -simexplorer.ui.web.explorationdata=simexplorer.ui.web.explorationdata -simexplorer.ui.web.explorations=simexplorer.ui.web.explorations -simexplorer.ui.web.hash=simexplorer.ui.web.hash -simexplorer.ui.web.history=simexplorer.ui.web.history -simexplorer.ui.web.language=simexplorer.ui.web.language -simexplorer.ui.web.libraries=simexplorer.ui.web.libraries -simexplorer.ui.web.library=simexplorer.ui.web.library -simexplorer.ui.web.name=simexplorer.ui.web.name -simexplorer.ui.web.result=simexplorer.ui.web.result -simexplorer.ui.web.rights.action=simexplorer.ui.web.rights.action -simexplorer.ui.web.structure=simexplorer.ui.web.structure -simexplorer.ui.web.structures=simexplorer.ui.web.structures -simexplorer.ui.web.title.applicationlist=simexplorer.ui.web.title.applicationlist -simexplorer.ui.web.title.deleteelement=simexplorer.ui.web.title.deleteelement -simexplorer.ui.web.title.elementdetail=simexplorer.ui.web.title.elementdetail -simexplorer.ui.web.title.elementexport=simexplorer.ui.web.title.elementexport -simexplorer.ui.web.title.elementhistory=simexplorer.ui.web.title.elementhistory -simexplorer.ui.web.title.elementimport=simexplorer.ui.web.title.elementimport -simexplorer.ui.web.title.elementrights=simexplorer.ui.web.title.elementrights -simexplorer.ui.web.title.groupedit=simexplorer.ui.web.title.groupedit -simexplorer.ui.web.title.grouplist=simexplorer.ui.web.title.grouplist -simexplorer.ui.web.title.install=simexplorer.ui.web.title.install -simexplorer.ui.web.title.login=simexplorer.ui.web.title.login -simexplorer.ui.web.title.pageerror=simexplorer.ui.web.title.pageerror -simexplorer.ui.web.title.searchresults=simexplorer.ui.web.title.searchresults -simexplorer.ui.web.title.useredit=simexplorer.ui.web.title.useredit -simexplorer.ui.web.title.userlist=simexplorer.ui.web.title.userlist -simexplorer.ui.web.type=simexplorer.ui.web.type -simexplorer.ui.web.value=simexplorer.ui.web.value -simexplorer.ui.web.values=simexplorer.ui.web.values -simexplorer.ui.web.version=simexplorer.ui.web.version +#Tue Feb 05 11:21:55 CET 2008 Modified: trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-fr_FR.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-fr_FR.properties 2008-02-05 10:27:30 UTC (rev 682) +++ trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-fr_FR.properties 2008-02-05 10:28:34 UTC (rev 683) @@ -1,43 +1 @@ -#Mon Feb 04 19:19:33 CET 2008 -simexplorer.service.security.norights= -simexplorer.ui.web.= -simexplorer.ui.web.actions= -simexplorer.ui.web.applicationexploration= -simexplorer.ui.web.code= -simexplorer.ui.web.codes= -simexplorer.ui.web.component= -simexplorer.ui.web.components= -simexplorer.ui.web.constant= -simexplorer.ui.web.date= -simexplorer.ui.web.description= -simexplorer.ui.web.explorationdata= -simexplorer.ui.web.explorations= -simexplorer.ui.web.hash= -simexplorer.ui.web.history= -simexplorer.ui.web.language= -simexplorer.ui.web.libraries= -simexplorer.ui.web.library= -simexplorer.ui.web.name= -simexplorer.ui.web.result= -simexplorer.ui.web.rights.action= -simexplorer.ui.web.structure= -simexplorer.ui.web.structures= -simexplorer.ui.web.title.applicationlist= -simexplorer.ui.web.title.deleteelement= -simexplorer.ui.web.title.elementdetail= -simexplorer.ui.web.title.elementexport= -simexplorer.ui.web.title.elementhistory= -simexplorer.ui.web.title.elementimport= -simexplorer.ui.web.title.elementrights= -simexplorer.ui.web.title.groupedit= -simexplorer.ui.web.title.grouplist= -simexplorer.ui.web.title.install= -simexplorer.ui.web.title.login= -simexplorer.ui.web.title.pageerror= -simexplorer.ui.web.title.searchresults= -simexplorer.ui.web.title.useredit= -simexplorer.ui.web.title.userlist= -simexplorer.ui.web.type= -simexplorer.ui.web.value= -simexplorer.ui.web.values= -simexplorer.ui.web.version= +#Tue Feb 05 11:21:55 CET 2008

1 0

r682 - in trunk: simexplorer-is-ear simexplorer-is-security simexplorer-is-service simexplorer-is-web
by glandais＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: glandais Date: 2008-02-05 10:27:30 +0000 (Tue, 05 Feb 2008) New Revision: 682 Modified: trunk/simexplorer-is-ear/profiles.xml trunk/simexplorer-is-security/profiles.xml trunk/simexplorer-is-service/profiles.xml trunk/simexplorer-is-web/profiles.xml Log: Removed parent properties Modified: trunk/simexplorer-is-ear/profiles.xml =================================================================== --- trunk/simexplorer-is-ear/profiles.xml 2008-02-05 09:26:21 UTC (rev 681) +++ trunk/simexplorer-is-ear/profiles.xml 2008-02-05 10:27:30 UTC (rev 682) @@ -5,24 +5,7 @@ <profiles> <profile> <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <properties> -  - <labs.id>130</labs.id> -  - <maven.src.dir>${basedir}/src</maven.src.dir> -  - <maven.test.skip>true</maven.test.skip> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> -  </properties> </profile> </profiles> Modified: trunk/simexplorer-is-security/profiles.xml =================================================================== --- trunk/simexplorer-is-security/profiles.xml 2008-02-05 09:26:21 UTC (rev 681) +++ trunk/simexplorer-is-security/profiles.xml 2008-02-05 10:27:30 UTC (rev 682) @@ -5,24 +5,7 @@ <profiles> <profile> <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <properties> -  - <labs.id>130</labs.id> -  - <maven.src.dir>${basedir}/src</maven.src.dir> -  - <maven.test.skip>true</maven.test.skip> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> -  </properties> </profile> </profiles> Modified: trunk/simexplorer-is-service/profiles.xml =================================================================== --- trunk/simexplorer-is-service/profiles.xml 2008-02-05 09:26:21 UTC (rev 681) +++ trunk/simexplorer-is-service/profiles.xml 2008-02-05 10:27:30 UTC (rev 682) @@ -5,24 +5,7 @@ <profiles> <profile> <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <properties> -  - <labs.id>130</labs.id> -  - <maven.src.dir>${basedir}/src</maven.src.dir> -  - <maven.test.skip>true</maven.test.skip> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> -  </properties> </profile> </profiles> Modified: trunk/simexplorer-is-web/profiles.xml =================================================================== --- trunk/simexplorer-is-web/profiles.xml 2008-02-05 09:26:21 UTC (rev 681) +++ trunk/simexplorer-is-web/profiles.xml 2008-02-05 10:27:30 UTC (rev 682) @@ -5,24 +5,7 @@ <profiles> <profile> <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> <properties> -  - <labs.id>130</labs.id> -  - <maven.src.dir>${basedir}/src</maven.src.dir> -  - <maven.test.skip>true</maven.test.skip> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> -  </properties> </profile> </profiles>

1 0

r681 - in trunk/simexplorer-is-web: . src/main/webapp/WEB-INF src/resources/fr/cemagref/simexplorer/is/ui/web src/resources/fr/cemagref/simexplorer/is/ui/web/components
by glandais＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: glandais Date: 2008-02-05 09:26:21 +0000 (Tue, 05 Feb 2008) New Revision: 681 Removed: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/pages/ Modified: trunk/simexplorer-is-web/pom.xml trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties Log: i18n Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-02-05 00:08:51 UTC (rev 680) +++ trunk/simexplorer-is-web/pom.xml 2008-02-05 09:26:21 UTC (rev 681) @@ -93,7 +93,6 @@ </executions> </plugin> - </plugins> </build> Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 00:08:51 UTC (rev 680) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-05 09:26:21 UTC (rev 681) @@ -47,3 +47,23 @@ noAttachment=No attachment attachments=Attachments +layout-windowtitle=Simexplorer SI +layout-pagetitle=Simexplorer SI + +layout-menutitle=Menu +layout-applications=Applications +layout-list=List +layout-import=Import + +layout-administration=Administration +layout-userlist=User list +layout-grouplist=Group list + +layout-localeen=English +layout-localefr=Français + +layout-logout=Logout + +layout-copyright=Copyright © 2008. Cemagref - GPL + +search=Search Deleted: trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties =================================================================== --- trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties 2008-02-05 00:08:51 UTC (rev 680) +++ trunk/simexplorer-is-web/src/resources/fr/cemagref/simexplorer/is/ui/web/components/Layout.properties 2008-02-05 09:26:21 UTC (rev 681) @@ -1,20 +0,0 @@ -layout-windowtitle=Simexplorer SI -layout-pagetitle=Simexplorer SI - -layout-menutitle=Menu -layout-applications=Applications -layout-list=List -layout-import=Import - -layout-administration=Administration -layout-userlist=User list -layout-grouplist=Group list - -layout-localeen=English -layout-localefr=Français - -layout-logout=Logout - -layout-copyright=Copyright © 2008. Cemagref - GPL - -search=Search \ No newline at end of file

1 0

r680 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: tchemit Date: 2008-02-05 00:08:51 +0000 (Tue, 05 Feb 2008) New Revision: 680 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java Log: ajout de detail Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-05 00:08:22 UTC (rev 679) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/DetailTabModel.java 2008-02-05 00:08:51 UTC (rev 680) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.model; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import jaxx.runtime.builder.TabModel; @@ -59,7 +60,13 @@ */ protected Version selectedVersion; + /** + * les métas à afficher dans le panel de détaillié à un uuid et à une version + * (ou null si pas de node sélectionné, ou pas de version). + */ + protected MetaData detail; + public String getName() { return tab.name(); } @@ -84,6 +91,10 @@ return versions; } + public MetaData getDetail() { + return detail; + } + public void setRemote(boolean remote) { this.remote = remote; } @@ -108,10 +119,15 @@ this.versions = versions; } + public void setDetail(MetaData detail) { + this.detail = detail; + } + public void reset() { rootNode = null; selectedNode = null; versions = null; selectedVersion = null; + detail=null; } } \ No newline at end of file

1 0

r679 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model
by tchemit＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: tchemit Date: 2008-02-05 00:08:22 +0000 (Tue, 05 Feb 2008) New Revision: 679 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java Log: permettre de construire un arbre de navigation a partir d'une librairie Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-05 00:07:54 UTC (rev 678) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/model/LoggableElementTreeHelper.java 2008-02-05 00:08:22 UTC (rev 679) @@ -122,6 +122,10 @@ if (element instanceof ExplorationData) { return buildExplorationDataNode(null, (ExplorationData) element); } + + if (element instanceof Library) { + return buildLibraryNode(null, (Library) element); + } throw new SimExplorerRuntimeException("could not foud a builder for " + element); }

1 0

r678 - in trunk: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 05 Feb '08

05 Feb '08

Author: tchemit Date: 2008-02-05 00:07:54 +0000 (Tue, 05 Feb 2008) New Revision: 678 Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Removed: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: deplacement pour le moment du storage service mocke dans le module swing (pour faciliter ledev) Deleted: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-04 21:45:29 UTC (rev 677) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-05 00:07:54 UTC (rev 678) @@ -1,280 +0,0 @@ -/* -* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, -* Tony Chemit -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* ##% */ -package fr.cemagref.simexplorer.is.service; - -import com.healthmarketscience.rmiio.RemoteInputStream; -import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; -import fr.cemagref.simexplorer.is.entities.data.LoggableElement; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; -import fr.cemagref.simexplorer.is.entities.metadata.Version; -import fr.cemagref.simexplorer.is.storage.MetaDataGenerator; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; - -/** - * The Class MockStorageServiceImpl. - * - * @author tony - */ -public class MockStorageServiceImpl implements StorageService { - - /** The Constant SIZE. */ - static final int SIZE = 400; - - /** The mock data. */ - protected SortedMap<String, MetaData> mockData; - - /** The mock data index. */ - protected List<String> mockDataIndex; - - /** The meta generator. */ - protected MetaDataGenerator metaGenerator; - - /** The generator. */ - protected ElementGenerator generator; - - /** - * Mock data. - * - * @return the sorted map< string, meta data> - */ - public SortedMap<String, MetaData> mockData() { - if (mockData == null) { - mockData = new TreeMap<String, MetaData>(); - mockDataIndex = new ArrayList<String>(); - MetaDataGenerator generator = new MetaDataGenerator(); - for (int i = 0; i < SIZE; i++) { - MetaData metaData = generator.generateMetaDataEntity(); - metaData.setName(i + " -- " + metaData.getName()); - mockData.put(metaData.getUuid(), metaData); - mockDataIndex.add(metaData.getUuid()); - } - } - return mockData; - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#commit() - */ - public void commit() throws SimExplorerServiceException { - checkImplemented(); - } - - /** - * Check implemented. - * - * @return the object - */ - private Object checkImplemented() { - throw new IllegalStateException("not implemented"); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#saveElement(java.lang.String, com.healthmarketscience.rmiio.RemoteInputStream) - */ - public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) - throws SimExplorerServiceException { - return (MetaData) checkImplemented(); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#saveElement(java.lang.String, com.healthmarketscience.rmiio.RemoteInputStream, java.util.Map) - */ - public MetaData saveElement(String token, - RemoteInputStream xmlRemoteStream, - Map<String, RemoteInputStream> attachmentsRemoteStream) - throws SimExplorerServiceException { - return (MetaData) checkImplemented(); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String) - */ - public MetaData getMetadata(String token, String uuid) - throws SimExplorerServiceException { - return mockData().get(uuid); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String, java.lang.String) - */ - public MetaData getMetadata(String token, String uuid, String version) - throws SimExplorerServiceException { - return mockData().get(uuid); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) - */ - public RemoteInputStream exportElement(String token, String uuid, - String version) throws SimExplorerServiceException { - return (RemoteInputStream) checkImplemented(); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) - */ - public RemoteInputStream exportFull(String token, String uuid, - String version) throws SimExplorerServiceException { - return (RemoteInputStream) checkImplemented(); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) - */ - public RemoteInputStream retrieveData(String token, String uuid, - String version, String dataKey) throws SimExplorerServiceException { - return null; - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#findFullTextCount(java.lang.String, java.lang.String, boolean) - */ - public int findFullTextCount(String token, String query, boolean onlyLatest) - throws SimExplorerServiceException { - // TODO Changer - return findApplicationsCount(token, onlyLatest); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#findFullText(java.lang.String, java.lang.String, boolean, int, int, int) - */ - public MetaData[] findFullText(String token, String query, - boolean onlyLatest, int indexStart, int count, int dateOrder) - throws SimExplorerServiceException { - // TODO Changer - return findApplications(token, onlyLatest, indexStart, count, dateOrder); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#findApplicationsCount(java.lang.String, boolean) - */ - public int findApplicationsCount(String token, boolean onlyLatest) - throws SimExplorerServiceException { - return mockData().size(); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) - */ - public MetaData[] findApplications(String token, boolean onlyLatest, - int start, int count, int dateOrder) - throws SimExplorerServiceException { - int last = start + count; - System.out.println("ask data from " + start + " width:" + count); - SortedMap<String, MetaData> map = mockData(); - if (last > map.size()) { - last = map.size(); - } - MetaData[] result = new MetaData[last - start]; - - for (int i = start; i < last; i++) { - result[i - start] = map.get(mockDataIndex.get(i)); - } - return result; - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) - */ - public LoggableElement getElement(String token, String uuid, String version) - throws SimExplorerServiceException { - try { - ExplorationApplication explorationApplication = getGenerator() - .generateRandomEA(); - explorationApplication.getMetaData().setUuid(uuid); - explorationApplication.getMetaData().setVersion(version); - return explorationApplication; - } catch (Exception e) { - throw new SimExplorerServiceException(e); - } - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) - */ - public MetaData[] getVersions(String token, String uuid) - throws SimExplorerServiceException { - MetaData meta = mockData().get(uuid); - Version version; - if (meta == null) { - version = Version.valueOf("1.0"); - } else { - version = meta.getVersion(); - } - return getMetaGenerator().generateVersionnedMetaData(version); - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#loginUser(java.lang.String, java.lang.String) - */ - public String loginUser(String login, String password) - throws SimExplorerServiceException { - if (login == null) { - throw new SimExplorerServiceException(new NullPointerException( - "login can not be null")); - } - return "password"; - } - - /** - * Gets the generator. - * - * @return the generator - */ - protected ElementGenerator getGenerator() { - if (generator == null) { - generator = new ElementGenerator(); - } - return generator; - } - - /** - * Gets the meta generator. - * - * @return the meta generator - */ - public MetaDataGenerator getMetaGenerator() { - if (metaGenerator == null) { - metaGenerator = new MetaDataGenerator(); - } - return metaGenerator; - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String, java.lang.String) - */ - public void deleteElement(String token, String uuid, String version) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String) - */ - public void deleteElement(String token, String uuid) { - // TODO Auto-generated method stub - - } - -} Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockDatabase.java 2008-02-05 00:07:54 UTC (rev 678) @@ -0,0 +1,147 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.service; + +import fr.cemagref.simexplorer.is.entities.data.Component; +import fr.cemagref.simexplorer.is.entities.data.ExplorationApplication; +import fr.cemagref.simexplorer.is.entities.data.ExplorationData; +import fr.cemagref.simexplorer.is.entities.data.Library; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; +import fr.cemagref.simexplorer.is.storage.VersionGenerator; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.SortedMap; +import java.util.TreeMap; + +/** + * Classe permettant de créer une base fictive + * + * @author chemit + */ +public class MockDatabase { + + static final int SIZE = 50; + + /** + * le dictionnaire d'ea indexées par leur uuid. + * Le premier ea est le parent (donc la version la plus petite) + */ + protected SortedMap<String, ExplorationApplication[]> eas; + + /** + * le dictionnaire des loggableElement indexées par leur uuid. + * Le premier LE est le parent (donc la version la plus petite) + */ + protected SortedMap<String, LoggableElement[]> loggableElements; + + /** + * le dictionnaire de meta data indexées par leur uuid. + * Le premier metadata est le parent (donc la version la plus petite) + */ + protected SortedMap<String, MetaData[]> metadatas; + + protected List<String> metadatasIndex; + + Random r; + + VersionGenerator versionGenerator; + + public MockDatabase() { + try { + init(); + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); + } + } + + /** + * initialise la base fictive + * + * @throws Exception si pb + */ + public void init() throws Exception { + + + ElementGenerator elementGenerator = new ElementGenerator(); + + r = new Random(); + + + versionGenerator = VersionGenerator.getInstance(); + + eas = new TreeMap<String, ExplorationApplication[]>(); + loggableElements = new TreeMap<String, LoggableElement[]>(); + metadatas = new TreeMap<String, MetaData[]>(); + metadatasIndex = new ArrayList<String>(); + + for (int i = 0; i < SIZE; i++) { + int nbSons = 2 + r.nextInt(10); + Version[] versions = versionGenerator.generateVersions(nbSons + 1); + + ExplorationApplication parentEA = elementGenerator.generateRandomEA(); + MetaData parentMetaData = parentEA.getMetaData(); + parentMetaData.setVersion(versions[0].toString()); + String uuid = parentMetaData.getUuid(); + List<ExplorationApplication> listSons = new ArrayList<ExplorationApplication>(nbSons); + listSons.add(parentEA); + for (int j = 0; j < nbSons; j++) { + ExplorationApplication sonEA = elementGenerator.generateRandomEA(); + sonEA.setParentData(parentEA); + sonEA.getMetaData().setUuid(uuid); + sonEA.getMetaData().setVersion(versions[j + 1].toString()); + listSons.add(sonEA); + } + registerEA(uuid, listSons.toArray(new ExplorationApplication[listSons.size()])); + } + } + + protected void registerEA(String uuid, ExplorationApplication... eas) { + this.eas.put(uuid, eas); + registerLoggableElement(uuid, eas); + for (Component component : eas[0].getComponents()) { + registerLoggableElement(component.getMetaData().getUuid(), component); + for (Library library : component.getLibraries()) { + registerLoggableElement(library.getMetaData().getUuid(), library); + } + } + for (ExplorationData explorationData : eas[0].getExplorations()) { + registerLoggableElement(explorationData.getMetaData().getUuid(), explorationData); + } + } + + protected void registerLoggableElement(String uuid, LoggableElement... loggableElements) { + this.loggableElements.put(uuid, loggableElements); + List<MetaData> datas = new ArrayList<MetaData>(); + for (LoggableElement data : loggableElements) { + datas.add(data.getMetaData()); + } + registerMetaData(uuid, datas.toArray(new MetaData[datas.size()])); + } + + protected void registerMetaData(String uuid, MetaData... datas) { + this.metadatas.put(uuid, datas); + this.metadatasIndex.add(uuid); + } + +} \ No newline at end of file Added: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java (rev 0) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-05 00:07:54 UTC (rev 678) @@ -0,0 +1,217 @@ +/* +* ##% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Code Lutin, +* Tony Chemit +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; either version 2 +* of the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* ##% */ +package fr.cemagref.simexplorer.is.service; + +import com.healthmarketscience.rmiio.RemoteInputStream; +import fr.cemagref.simexplorer.is.entities.data.LoggableElement; +import fr.cemagref.simexplorer.is.entities.metadata.MetaData; +import fr.cemagref.simexplorer.is.entities.metadata.Version; + +import java.util.Map; +import java.util.SortedMap; + +/** + * The Class MockStorageServiceImpl. + * + * @author chemit + */ +public class MockStorageServiceImpl implements StorageService { + + /** The Constant SIZE. */ + static final int SIZE = 400; + + protected MockDatabase base; + + public MockStorageServiceImpl() { + base = new MockDatabase(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#commit() + */ + public void commit() throws SimExplorerServiceException { + checkImplemented(); + } + + /** + * Check implemented. + * + * @return the object + */ + private Object checkImplemented() { + throw new IllegalStateException("not implemented"); + } + + public MetaData saveElement(String token, RemoteInputStream zipRemoteStream) + throws SimExplorerServiceException { + return (MetaData) checkImplemented(); + } + + public MetaData saveElement(String token, + RemoteInputStream xmlRemoteStream, + Map<String, RemoteInputStream> attachmentsRemoteStream) + throws SimExplorerServiceException { + return (MetaData) checkImplemented(); + } + + public MetaData getMetadata(String token, String uuid) + throws SimExplorerServiceException { + MetaData[] datas = base.metadatas.get(uuid); + return datas == null ? null : datas[0]; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#getMetadata(java.lang.String, java.lang.String, java.lang.String) + */ + public MetaData getMetadata(String token, String uuid, String version) + throws SimExplorerServiceException { + MetaData[] datas = base.metadatas.get(uuid); + if (datas == null) { + return null; + } + Version v = Version.valueOf(version); + for (MetaData data : datas) { + if (data.getVersion().equals(v)) { + return data; + } + } + return null; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#exportElement(java.lang.String, java.lang.String, java.lang.String) + */ + public RemoteInputStream exportElement(String token, String uuid, + String version) throws SimExplorerServiceException { + return (RemoteInputStream) checkImplemented(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#exportFull(java.lang.String, java.lang.String, java.lang.String) + */ + public RemoteInputStream exportFull(String token, String uuid, + String version) throws SimExplorerServiceException { + return (RemoteInputStream) checkImplemented(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#retrieveData(java.lang.String, java.lang.String, java.lang.String, java.lang.String) + */ + public RemoteInputStream retrieveData(String token, String uuid, + String version, String dataKey) throws SimExplorerServiceException { + return null; + } + + public int findFullTextCount(String token, String query, boolean onlyLatest) + throws SimExplorerServiceException { + // TODO Changer + return findApplicationsCount(token, onlyLatest); + } + + public MetaData[] findFullText(String token, String query, + boolean onlyLatest, int indexStart, int count, int dateOrder) + throws SimExplorerServiceException { + // TODO Changer + return findApplications(token, onlyLatest, indexStart, count, dateOrder); + } + + public int findApplicationsCount(String token, boolean onlyLatest) + throws SimExplorerServiceException { + return base.metadatas.size(); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#findApplications(java.lang.String, boolean, int, int, int) + */ + public MetaData[] findApplications(String token, boolean onlyLatest, + int start, int count, int dateOrder) + throws SimExplorerServiceException { + int last = start + count; + System.out.println("ask data from " + start + " width:" + count); + SortedMap<String, MetaData[]> map = base.metadatas; + if (last > map.size()) { + last = map.size(); + } + MetaData[] result = new MetaData[last - start]; + + for (int i = start; i < last; i++) { + result[i - start] = map.get(base.metadatasIndex.get(i))[0]; + } + return result; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#getElement(java.lang.String, java.lang.String, java.lang.String) + */ + public LoggableElement getElement(String token, String uuid, String version) + throws SimExplorerServiceException { + try { + LoggableElement[] eas = base.loggableElements.get(uuid); + if (eas == null) { + return null; + } + Version v = Version.valueOf(version); + for (LoggableElement ea : eas) { + if (ea.getMetaData().getVersion().equals(v)) { + return ea; + } + } + return null; + } catch (Exception e) { + throw new SimExplorerServiceException(e); + } + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#getVersions(java.lang.String, java.lang.String) + */ + public MetaData[] getVersions(String token, String uuid) + throws SimExplorerServiceException { + return base.metadatas.get(uuid); + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#loginUser(java.lang.String, java.lang.String) + */ + public String loginUser(String login, String password) + throws SimExplorerServiceException { + if (login == null) { + throw new SimExplorerServiceException(new NullPointerException( + "login can not be null")); + } + return "password"; + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String, java.lang.String) + */ + public void deleteElement(String token, String uuid, String version) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see fr.cemagref.simexplorer.is.service.StorageService#deleteElement(java.lang.String, java.lang.String) + */ + public void deleteElement(String token, String uuid) { + // TODO Auto-generated method stub + + } + +}

1 0

r677 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 21:45:29 +0000 (Mon, 04 Feb 2008) New Revision: 677 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java Log: le formatage d'eclipse est un peu douteux... Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-04 21:42:48 UTC (rev 676) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementDetail.java 2008-02-04 21:45:29 UTC (rev 677) @@ -160,11 +160,8 @@ private List<TreeNode> generateExplorations( ExplorationApplication explorationApplication) { List<TreeNode> res = new ArrayList<TreeNode>(); - int i = 0; - for (ExplorationData explorationData : explorationApplication - .getExplorations()) { - res.add(generateExplorationData(explorationData)); - i++; + for (ExplorationData data : explorationApplication.getExplorations()) { + res.add(generateExplorationData(data)); } return res; }

1 0

r676 - trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages
by tchemit＠users.labs.libre-entreprise.org 04 Feb '08

04 Feb '08

Author: tchemit Date: 2008-02-04 21:42:48 +0000 (Mon, 04 Feb 2008) New Revision: 676 Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java Log: la m?\195?\169thode i18n._ permet le passage de param?\195?\168tre Modified: trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java =================================================================== --- trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-04 20:57:41 UTC (rev 675) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementList.java 2008-02-04 21:42:48 UTC (rev 676) @@ -130,8 +130,7 @@ * @return the detail element context */ public String getDetailElementContext() { - String result = _element.getUuid() + "," + _element.getVersion(); - return result; + return _element.getUuid() + "," + _element.getVersion(); } /** @@ -155,18 +154,14 @@ */ @Override public String getWindowTitle() { - String windowTitle = null; + String title; if (elementDataSource.getQuery() != null && !elementDataSource.getQuery().equals("")) { - windowTitle = String.format( - _("simexplorer.ui.web.title.searchresults"),// "Search - // results for - // \"%s\"", - elementDataSource.getQuery()); + title = _("simexplorer.ui.web.title.searchresults",elementDataSource.getQuery()); } else { - windowTitle = _("simexplorer.ui.web.title.applicationlist"); + title = _("simexplorer.ui.web.title.applicationlist"); } - return windowTitle; + return title; } }

1 0