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

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

07 Feb '08

Author: tchemit Date: 2008-02-07 11:04:43 +0000 (Thu, 07 Feb 2008) New Revision: 705 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java Log: il faut d?\195?\169tacher les listeners attach?\195?\169s aux models lors d'un rechargement d'ui Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-07 10:53:13 UTC (rev 704) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-02-07 11:04:43 UTC (rev 705) @@ -23,11 +23,12 @@ import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; +import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; +import java.awt.event.ActionEvent; import java.io.IOException; -import java.awt.event.ActionEvent; /** * L'application principale @@ -60,6 +61,9 @@ SimExplorerActionManager.resetCache(); JConfigUI.reloadUI(); SimExplorerTab.getFactory().resetCache(); + // must remove listener on data model ? + DetailTabModel detailModel = ((DetailTabModel) SimExplorerTab.detail.getModel()); + detailModel.removePropertyChangeListeners(); } /** @@ -106,7 +110,7 @@ if (conf.isAutoConnect()) { try { // try to connect - mainUI.getConnect().getAction().actionPerformed(new ActionEvent(mainUI,0,"connect")); + mainUI.getConnect().getAction().actionPerformed(new ActionEvent(mainUI, 0, "connect")); } catch (Exception e) { // ignore ? System.err.println(e.getMessage()); @@ -116,7 +120,7 @@ boolean isConnected = context.isConnected(); // refresh ui accessibles actions - SimExplorerUIRefreshHelper.refreshConnnectState(mainUI,isConnected); + SimExplorerUIRefreshHelper.refreshConnnectState(mainUI, isConnected); if (isConnected) { if (conf.isShowRemoteTab()) {

1 0

r704 - trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab
by tchemit＠users.labs.libre-entreprise.org 07 Feb '08

07 Feb '08

Author: tchemit Date: 2008-02-07 10:53:13 +0000 (Thu, 07 Feb 2008) New Revision: 704 Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx Log: ajout de la liste des attachments sur le d?\195?\169tail d'un LE Modified: trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx =================================================================== --- trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-06 18:40:57 UTC (rev 703) +++ trunk/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/tab/JApplicationDetailTab.jaxx 2008-02-07 10:53:13 UTC (rev 704) @@ -22,6 +22,13 @@ </JPanel> </cell> </row> + <row> + <cell fill='vertical'> + <JPanel id='detailHeaderAttachmentsPanel'> + <JLabel id='detailAttachmentsHeader' text='{_("simexplorer.node.noattachments")}'/> + </JPanel> + </cell> + </row> <row fill="both" weightx="1" weighty="1"> <cell> <JSplitPane id='splitOne' orientation="horizontal" resizeWeight="0.4" oneTouchExpandable='true'> @@ -70,6 +77,13 @@ </JScrollPane> </cell> </row> + <row> + <cell columns='2' fill='horizontal'> + <JScrollPane id='scrollAttachments' columnHeaderView='{detailHeaderAttachmentsPanel}'> + <JList id="detailAttachments" model='{new DefaultListModel()}' /> + </JScrollPane> + </cell> + </row> <row weighty="1" weightx="2" > <cell fill='both' columns='2'> <JPanel>

1 0

r703 - in trunk: simexplorer-is-entities/src/resources/i18n simexplorer-is-security/src/resources/i18n simexplorer-is-service/src/resources/i18n simexplorer-is-storage/src/resources/i18n simexplorer-is-storage/src/resources/properties simexplorer-is-swing/src/resources/i18n simexplorer-is-web/src/resources/i18n
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 18:40:57 +0000 (Wed, 06 Feb 2008) New Revision: 703 Modified: trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-en_GB.properties trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-fr_FR.properties trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-en_GB.properties trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-fr_FR.properties trunk/simexplorer-is-storage/src/resources/properties/config.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 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: i18n Modified: trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties =================================================================== --- trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-en_GB.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,2 +1 @@ -#Mon Feb 04 19:19:22 CET 2008 simexplorer.contenttype.rawtype=Raw file (text) Modified: trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties =================================================================== --- trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-entities/src/resources/i18n/simexplorer-is-entities-fr_FR.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,2 +1 @@ -#Mon Feb 04 19:19:22 CET 2008 simexplorer.contenttype.rawtype=Fichier brut (texte) Modified: trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-en_GB.properties =================================================================== --- trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-en_GB.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-en_GB.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1 +0,0 @@ -#Mon Feb 04 19:20:41 GMT 2008 Modified: trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-fr_FR.properties =================================================================== --- trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-fr_FR.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-security/src/resources/i18n/simexplorer-is-security-fr_FR.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1 +0,0 @@ -#Mon Feb 04 19:20:41 GMT 2008 Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,4 +1,3 @@ -#Wed Feb 06 18:38:20 CET 2008 simexplorer.service.business.groupexist=Group already exist simexplorer.service.business.userexist=User already exist simexplorer.service.invalidhash=Invalid hash for file Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,6 +1,5 @@ -#Wed Feb 06 18:38:20 CET 2008 -simexplorer.service.business.groupexist=Le groupe existe déjà -simexplorer.service.business.userexist=L'utilisateur existe déjà +simexplorer.service.business.groupexist=Le groupe existe d\u00E9j\u00E0 +simexplorer.service.business.userexist=L'utilisateur existe d\u00E9j\u00E0 simexplorer.service.invalidhash=Hash invalide pour un fichier simexplorer.service.mail.footer=Simexplorer IS simexplorer.service.mail.header=Informations de votre compte Modified: trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-en_GB.properties =================================================================== --- trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-en_GB.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-en_GB.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1 +0,0 @@ -#Mon Feb 04 19:20:52 GMT 2008 Modified: trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-fr_FR.properties =================================================================== --- trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-fr_FR.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-storage/src/resources/i18n/simexplorer-is-storage-fr_FR.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1 +0,0 @@ -#Mon Feb 04 19:20:52 GMT 2008 Modified: trunk/simexplorer-is-storage/src/resources/properties/config.properties =================================================================== --- trunk/simexplorer-is-storage/src/resources/properties/config.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-storage/src/resources/properties/config.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,3 +1,3 @@ -simexplorer.db=/var/local/simexplorer/db5 -simexplorer.data=/var/local/simexplorer/data5/ +simexplorer.db=/var/local/simexplorer/db1 +simexplorer.data=/var/local/simexplorer/data1/ simexplorer.optimizeperiod=3600 Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,4 +1,3 @@ -#Wed Feb 06 16:33:27 GMT 2008 simexplorer.action.about=About simexplorer.action.about.help= simexplorer.action.about.tooltip=Show About dialog Modified: trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1,4 +1,3 @@ -#Wed Feb 06 16:33:27 GMT 2008 simexplorer.action.about=A propos simexplorer.action.about.help= simexplorer.action.about.tooltip=Afficher les cr\u00E9dits 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-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-en_GB.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1 +0,0 @@ -#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-06 17:52:32 UTC (rev 702) +++ trunk/simexplorer-is-web/src/resources/i18n/simexplorer-is-web-fr_FR.properties 2008-02-06 18:40:57 UTC (rev 703) @@ -1 +0,0 @@ -#Tue Feb 05 11:21:55 CET 2008

1 0

r702 - trunk/simexplorer-is-service/src/resources/i18n
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 17:52:32 +0000 (Wed, 06 Feb 2008) New Revision: 702 Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties Log: i18n Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-06 17:51:20 UTC (rev 701) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-06 17:52:32 UTC (rev 702) @@ -1,4 +1,6 @@ -#Wed Feb 06 16:29:07 CET 2008 +#Wed Feb 06 18:38:20 CET 2008 +simexplorer.service.business.groupexist=Group already exist +simexplorer.service.business.userexist=User already exist simexplorer.service.invalidhash=Invalid hash for file simexplorer.service.mail.footer=Simexplorer IS simexplorer.service.mail.header=Your account informations Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-06 17:51:20 UTC (rev 701) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-06 17:52:32 UTC (rev 702) @@ -1,4 +1,6 @@ -#Wed Feb 06 16:29:07 CET 2008 +#Wed Feb 06 18:38:20 CET 2008 +simexplorer.service.business.groupexist=Le groupe existe déjà +simexplorer.service.business.userexist=L'utilisateur existe déjà simexplorer.service.invalidhash=Hash invalide pour un fichier simexplorer.service.mail.footer=Simexplorer IS simexplorer.service.mail.header=Informations de votre compte @@ -8,5 +10,5 @@ simexplorer.service.mail.requestfooter=Simexplorer IS simexplorer.service.mail.requestheader=Demande de compte simexplorer.service.mail.subject=Simexplorer IS message web -simexplorer.service.nologonlocal=Login local incohérent -simexplorer.service.security.norights=Pas assez de droit pour réaliser cette action +simexplorer.service.nologonlocal=Login local incoh\u00E9rent +simexplorer.service.security.norights=Pas assez de droit pour r\u00E9aliser cette action

1 0

r701 - trunk/simexplorer-is-security/src/java
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 17:51:20 +0000 (Wed, 06 Feb 2008) New Revision: 701 Modified: trunk/simexplorer-is-security/src/java/h2-ds.xml Log: Modification des param?\195?\168tres de connexion de la base : lib?\195?\169ration des connexions d?\195?\169lai plus long d'attente des locks Modified: trunk/simexplorer-is-security/src/java/h2-ds.xml =================================================================== --- trunk/simexplorer-is-security/src/java/h2-ds.xml 2008-02-06 17:50:14 UTC (rev 700) +++ trunk/simexplorer-is-security/src/java/h2-ds.xml 2008-02-06 17:51:20 UTC (rev 701) @@ -16,7 +16,7 @@ <local-tx-datasource> <jndi-name>h2datasource</jndi-name> <connection-url> - jdbc:h2:/var/local/simexplorer/h2/security + jdbc:h2:/var/local/simexplorer/h2/security;LOCK_TIMEOUT=20000;LOCK_MODE=3 </connection-url> <driver-class>org.h2.Driver</driver-class> <user-name></user-name>

1 0

r700 - trunk/simexplorer-is-web/src/main/webapp/WEB-INF
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 17:50:14 +0000 (Wed, 06 Feb 2008) New Revision: 700 Modified: trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties Log: 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-06 17:17:04 UTC (rev 699) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-06 17:50:14 UTC (rev 700) @@ -21,7 +21,7 @@ simexplorer.ui.web.library=Library simexplorer.ui.web.name=Name simexplorer.ui.web.result=Result -simexplorer.ui.web.rights.action=Action +simexplorer.ui.web.rights.action=Rights simexplorer.ui.web.structure=Structure simexplorer.ui.web.structures=Structures simexplorer.ui.web.title.applicationlist=Application list

1 0

r699 - trunk/simexplorer-is-service/src/resources/i18n
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 17:17:04 +0000 (Wed, 06 Feb 2008) New Revision: 699 Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties Log: i18n Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-06 17:12:48 UTC (rev 698) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-en_GB.properties 2008-02-06 17:17:04 UTC (rev 699) @@ -1,8 +1,12 @@ -#Mon Feb 04 19:19:30 CET 2008 -simexplorer.service.mail.footer=simexplorer.service.mail.footer -simexplorer.service.mail.header=simexplorer.service.mail.header -simexplorer.service.mail.login=simexplorer.service.mail.login -simexplorer.service.mail.password=simexplorer.service.mail.password -simexplorer.service.mail.subject=simexplorer.service.mail.subject -simexplorer.service.nologonlocal=simexplorer.service.nologonlocal -simexplorer.service.security.norights=simexplorer.service.security.norights +#Wed Feb 06 16:29:07 CET 2008 +simexplorer.service.invalidhash=Invalid hash for file +simexplorer.service.mail.footer=Simexplorer IS +simexplorer.service.mail.header=Your account informations +simexplorer.service.mail.login=Login +simexplorer.service.mail.mail=Mail +simexplorer.service.mail.password=Password +simexplorer.service.mail.requestfooter=Simexplorer IS +simexplorer.service.mail.requestheader=Account request +simexplorer.service.mail.subject=Simexplorer IS web message +simexplorer.service.nologonlocal=Local logon is non sense +simexplorer.service.security.norights=Not enough rights to perform that action Modified: trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties =================================================================== --- trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-06 17:12:48 UTC (rev 698) +++ trunk/simexplorer-is-service/src/resources/i18n/simexplorer-is-service-fr_FR.properties 2008-02-06 17:17:04 UTC (rev 699) @@ -1,8 +1,12 @@ -#Mon Feb 04 19:19:30 CET 2008 -simexplorer.service.mail.footer= -simexplorer.service.mail.header= -simexplorer.service.mail.login= -simexplorer.service.mail.password= -simexplorer.service.mail.subject= -simexplorer.service.nologonlocal= -simexplorer.service.security.norights= +#Wed Feb 06 16:29:07 CET 2008 +simexplorer.service.invalidhash=Hash invalide pour un fichier +simexplorer.service.mail.footer=Simexplorer IS +simexplorer.service.mail.header=Informations de votre compte +simexplorer.service.mail.login=Login +simexplorer.service.mail.mail=Mail +simexplorer.service.mail.password=Mot de passe +simexplorer.service.mail.requestfooter=Simexplorer IS +simexplorer.service.mail.requestheader=Demande de compte +simexplorer.service.mail.subject=Simexplorer IS message web +simexplorer.service.nologonlocal=Login local incohérent +simexplorer.service.security.norights=Pas assez de droit pour réaliser cette action

1 0

r698 - trunk/simexplorer-is/src/site/fr/rst
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 17:12:48 +0000 (Wed, 06 Feb 2008) New Revision: 698 Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst Log: MAJ todo Modified: trunk/simexplorer-is/src/site/fr/rst/todo.rst =================================================================== --- trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-06 17:12:28 UTC (rev 697) +++ trunk/simexplorer-is/src/site/fr/rst/todo.rst 2008-02-06 17:12:48 UTC (rev 698) @@ -7,11 +7,8 @@ - Règles de gestion pour la journalisation d'un élément - Règles de gestion pour la suppression d'élément (élément liés, etc) - - Règles de gestion pour la suppression d'un groupe/utilisateur (éléments liés) - - Génération mot de passe ("password" pour le moment) - - Validation d'archive (checksum) - - Envoi de mail aux superadmins lors de la requête d'un compte - + - Règles de gestion pour la suppression d'un groupe/utilisateur (affichage selon flag) + Client léger ============

1 0

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

06 Feb '08

Author: glandais Date: 2008-02-06 17:12:28 +0000 (Wed, 06 Feb 2008) New Revision: 697 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/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/main/webapp/Login.tml trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties Log: Attachment handling & User security 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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/ElementExport.java 2008-02-06 17:12:28 UTC (rev 697) @@ -113,19 +113,30 @@ * @return the object */ public Object onDownloadFile(String context) { - StreamResponse response; + StreamResponse response = null; try { StringTokenizer st = new StringTokenizer(context, ","); String uuid = st.nextToken(); String version = st.nextToken(); - String fileName = st.nextToken(); + String attachmentUniqueId = st.nextToken(); - RemoteInputStream ris = RemoteStorageService.getStorageService() - .retrieveData(getToken(), uuid, version, fileName); - InputStream stream = RemoteInputStreamClient.wrap(ris); + MetaData metadata = RemoteStorageService.getStorageService() + .getMetadata(getToken(), uuid, version); + List<Attachment> attachments = metadata.getAttachments(); + for (Attachment attachment : attachments) { + if (attachment.getUniqueId().equals(attachmentUniqueId)) { + RemoteInputStream ris = RemoteStorageService + .getStorageService().retrieveData(getToken(), uuid, + version, attachment); + InputStream stream = RemoteInputStreamClient.wrap(ris); - response = new AttachmentStreamResponse(stream, fileName); + response = new AttachmentStreamResponse(stream, attachment + .getFileName()); + return response; + } + } + } catch (Exception e) { throw new SimExplorerWebException(e); } 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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Install.java 2008-02-06 17:12:28 UTC (rev 697) @@ -36,6 +36,7 @@ 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.metadata.Version; import fr.cemagref.simexplorer.is.factories.BaseEntityFactory; import fr.cemagref.simexplorer.is.factories.XmlConstants; import fr.cemagref.simexplorer.is.service.ElementGenerator; @@ -80,18 +81,18 @@ parentEa = elementGenerator.generateRandomEA(); int v = 2 + r.nextInt(5); + Version version = new Version(parentEa.getMetaData().getVersion().toString()); - for (int j = 0; j < v; j++) { + for (int j = 0; j < v; j++) { ExplorationApplication ea = elementGenerator .generateRandomEA(); ea.getMetaData().setUuid(parentEa.getMetaData().getUuid()); - ea.getMetaData().setVersion( - parentEa.getMetaData().getVersion().toString()); + + version = version.incVersion(r.nextInt(3)); + ea.getMetaData().setVersion(version.toString()); - ea.getMetaData().getVersion().incVersion(r.nextInt(3)); + Map<Attachment, RemoteInputStream> attachments = new HashMap<Attachment, RemoteInputStream>(); - Map<String, RemoteInputStream> attachments = new HashMap<String, RemoteInputStream>(); - List<Attachment> attachmentsKeys = new ArrayList<Attachment>(); attachmentsKeys.addAll(ea.getMetaData().getAttachments()); @@ -117,8 +118,7 @@ attachment.setDataHash(randomStream.getMd5()); RemoteInputStreamServer remoteStream = new SimpleRemoteInputStream( randomStream.getStream()); - attachments.put(attachment.getUniqueId(), remoteStream - .export()); + attachments.put(attachment, remoteStream.export()); } InputStream xmlStream = BaseEntityFactory.getFactory( 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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-06 17:12:28 UTC (rev 697) @@ -42,6 +42,12 @@ /** The password. */ private String password; + /** The login. */ + private String login; + + /** The mail. */ + private String mail; + /** The element list. */ @InjectPage private ElementList elementList; @@ -56,22 +62,22 @@ /** The form. */ @Component - private Form form; + private Form formLogin; /** * On success. * * @return the object */ - public Object onSuccess() { + public Object onSuccessFromFormLogin() { try { token = RemoteSecurityService.getAuthentificationService() .loginUser(user, password); - System.out.println(token); if (token != null && !token.equals("")) { return elementList; } - form.recordError(messages.get("simexplorer.ui.web.login.invalid")); + formLogin.recordError(messages + .get("simexplorer.ui.web.login.invalid")); return this; } catch (SimExplorerServiceException e) { throw new SimExplorerWebException(e); @@ -79,6 +85,21 @@ } /** + * On success from form request account. + * + * @return the object + */ + public Object onSuccessFromFormRequestAccount() { + try { + RemoteSecurityService.getAuthentificationService().requestAccount( + login, mail); + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + return this; + } + + /** * Gets the user. * * @return the user @@ -134,4 +155,42 @@ return messages.get("simexplorer.ui.web.title.login"); } + /** + * Gets the login. + * + * @return the login + */ + public String getLogin() { + return login; + } + + /** + * Sets the login. + * + * @param login + * the new login + */ + public void setLogin(String login) { + this.login = login; + } + + /** + * Gets the mail. + * + * @return the mail + */ + public String getMail() { + return mail; + } + + /** + * Sets the mail. + * + * @param mail + * the new mail + */ + public void setMail(String mail) { + this.mail = mail; + } + } 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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/UserEdit.java 2008-02-06 17:12:28 UTC (rev 697) @@ -136,11 +136,10 @@ if (user.getId() == null) { user = RemoteSecurityService.getAuthentificationService() .saveUser(getToken(), user.getLogin(), user.getMail()); - } else { - user = RemoteSecurityService.getAuthentificationService() - .updateUser(getToken(), user); + return this; } - + user = RemoteSecurityService.getAuthentificationService() + .updateUser(getToken(), user); Integer[] groupsIds = new Integer[groupsOfUser.size()]; int i = 0; for (Group group : groupsOfUser) { @@ -149,11 +148,11 @@ } RemoteSecurityService.getAuthentificationService().setGroupsOfUser( getToken(), user, groupsIds); + return userList; + } catch (SimExplorerServiceException e) { throw new SimExplorerWebException(e); } - - return userList; } /** @@ -219,6 +218,21 @@ } /** + * On action from reset password. + * + * @return the object + */ + public Object onActionFromResetPassword() { + try { + RemoteSecurityService.getAuthentificationService().resetPassword( + getToken(), user.getLogin()); + return this; + } catch (SimExplorerServiceException e) { + throw new SimExplorerWebException(e); + } + } + + /** * Gets the user list. * * @return the user list Modified: trunk/simexplorer-is-web/src/main/webapp/Login.tml =================================================================== --- trunk/simexplorer-is-web/src/main/webapp/Login.tml 2008-02-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/main/webapp/Login.tml 2008-02-06 17:12:28 UTC (rev 697) @@ -3,7 +3,7 @@ <h1 class="Title">${windowtitle}</h1> - <t:form> + <t:form t:id="formLogin"> <t:errors /> @@ -16,6 +16,21 @@ t:validate="required,minlength=1" t:value="password" size="30" /> <br /> <input t:type="Submit" t:value="${message:simexplorer.ui.web.login}" /> + </t:form> + <t:form t:id="formRequestAccount"> + <div t:type="t5components/SlidingPanel" closed="true" + subject="${message:simexplorer.ui.web.login.requestaccount}"> + ${message:simexplorer.ui.web.login} : <input t:type="TextField" + t:id="loginField" t:validate="required,minlength=1" t:value="login" + size="30" /> <br /> + ${message:simexplorer.ui.web.mail} : <input t:type="TextField" + t:id="mailField" t:validate="required,minlength=1" t:value="mail" + size="30" /> <br /> + <input t:type="Submit" + t:value="${message:simexplorer.ui.web.login.requestaccount}" /></div> + </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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/main/webapp/UserEdit.tml 2008-02-06 17:12:28 UTC (rev 697) @@ -15,29 +15,31 @@ <p><t:label for="mail" />: <input t:type="TextField" t:id="mail" t:validate="required,minlength=4" t:value="user.mail" size="40" /></p> - <p><t:label for="isAdmin" />: <input t:type="checkbox" - t:id="isAdmin" t:value="user.admin" /></p> + <t:if test="creating" negate="true"> + <p><t:label for="isAdmin" />: <input t:type="checkbox" + t:id="isAdmin" t:value="user.admin" /></p> - <p><t:label for="isSuperAdmin" />: <input t:type="checkbox" - t:id="isSuperAdmin" t:value="user.superAdmin" /></p> + <p><t:label for="isSuperAdmin" />: <input t:type="checkbox" + t:id="isSuperAdmin" t:value="user.superAdmin" /></p> - <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:simexplorer.ui.web.password} : <a + t:type="ActionLink" t:id="resetPassword">${message:simexplorer.ui.web.resetPassword}</a> + </p> - <p>${message:simexplorer.ui.web.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:simexplorer.ui.web.ownerOf} : - <table t:type="Grid" source="ownedGroups" row="group" - model="groupModel"> - <t:parameter name="empty"> + <p>${message:simexplorer.ui.web.ownerOf} : + <table t:type="Grid" source="ownedGroups" row="group" + model="groupModel"> + <t:parameter name="empty"> ${message:simexplorer.ui.web.none} </t:parameter> - </table> - </p> + </table> + </p> + </t:if> <input t:type="Submit" t:value="${message:simexplorer.ui.web.submit}" /> <a t:type="actionlink" t:id="cancel">${message:simexplorer.ui.web.cancel}</a> 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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app.properties 2008-02-06 17:12:28 UTC (rev 697) @@ -66,6 +66,9 @@ simexplorer.ui.web.layout.install=Generate data +simexplorer.ui.web.login.invalid=Invalid login +simexplorer.ui.web.login.requestaccount=Request account + simexplorer.ui.web.back=Back simexplorer.ui.web.cancel=Cancel simexplorer.ui.web.confirm=Confirm 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-06 17:11:57 UTC (rev 696) +++ trunk/simexplorer-is-web/src/main/webapp/WEB-INF/app_fr.properties 2008-02-06 17:12:28 UTC (rev 697) @@ -67,6 +67,7 @@ simexplorer.ui.web.layout.install=Générer des données simexplorer.ui.web.login.invalid=Echec de la connexion +simexplorer.ui.web.login.requestaccount=Ouvrir un compte simexplorer.ui.web.back=Retour simexplorer.ui.web.cancel=Annuler

1 0

r696 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is: service ui/swing/actions
by glandais＠users.labs.libre-entreprise.org 06 Feb '08

06 Feb '08

Author: glandais Date: 2008-02-06 17:11:57 +0000 (Wed, 06 Feb 2008) New Revision: 696 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java Log: Attachment handling Modified: 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 2008-02-06 17:11:44 UTC (rev 695) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-06 17:11:57 UTC (rev 696) @@ -19,6 +19,8 @@ package fr.cemagref.simexplorer.is.service; import com.healthmarketscience.rmiio.RemoteInputStream; + +import fr.cemagref.simexplorer.is.attachment.Attachment; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; @@ -65,7 +67,7 @@ public MetaData saveElement(String token, RemoteInputStream xmlRemoteStream, - Map<String, RemoteInputStream> attachmentsRemoteStream) + Map<Attachment, RemoteInputStream> attachmentsRemoteStream) throws SimExplorerServiceException { return (MetaData) checkImplemented(); } @@ -114,7 +116,7 @@ * @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 { + String version, Attachment attachment) throws SimExplorerServiceException { return null; } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-06 17:11:44 UTC (rev 695) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/DownloadAction.java 2008-02-06 17:11:57 UTC (rev 696) @@ -101,7 +101,7 @@ protected void doAction(ActionEvent e) throws Exception { super.doAction(e); StorageService service = getContext().getStorageService(((DetailTabModel) getModel()).isRemote()); - RemoteInputStream ris = service.retrieveData(getContext().getToken(), uuid, version.toString(), "_xml"); + RemoteInputStream ris = service.exportElement(getContext().getToken(), uuid, version.toString()); if (ris == null) { // todo log error log.warn("could not get incoming data for " + uuid);

1 0