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

r945 - trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 23:39:43 +0000 (Wed, 13 Feb 2008) New Revision: 945 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties Log: connect i18n gb Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-13 23:11:39 UTC (rev 944) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-13 23:39:43 UTC (rev 945) @@ -117,16 +117,16 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= -simexplorer.common.apply= -simexplorer.common.cancel= +simexplorer.common.apply=Apply +simexplorer.common.cancel=Cancel simexplorer.common.close=Close simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.key=key -simexplorer.common.login= +simexplorer.common.login=Login simexplorer.common.name=name -simexplorer.common.ok= -simexplorer.common.passphrase= +simexplorer.common.ok=Ok +simexplorer.common.passphrase=Password simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version @@ -156,9 +156,9 @@ simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Help -simexplorer.login.failed= -simexplorer.login.retry= -simexplorer.login.title= +simexplorer.login.failed=Authentication failed +simexplorer.login.retry=Do you want to retry ? +simexplorer.login.title=Authentication to central server simexplorer.main.menu=Main simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration=

1 0

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

13 Feb '08

Author: tchemit Date: 2008-02-13 23:11:39 +0000 (Wed, 13 Feb 2008) New Revision: 944 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java Log: repaint inutile Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-13 23:09:54 UTC (rev 943) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-13 23:11:39 UTC (rev 944) @@ -87,8 +87,7 @@ @Override protected void afterAction(ActionEvent e) throws Exception { super.afterAction(e); - tree.invalidate(); - getUI().repaint(); + tree.invalidate(); getMainUI().repaint(); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-13 23:09:54 UTC (rev 943) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-13 23:11:39 UTC (rev 944) @@ -88,8 +88,7 @@ @Override protected void afterAction(ActionEvent e) throws Exception { super.afterAction(e); - tree.invalidate(); - getUI().repaint(); + tree.invalidate(); getMainUI().repaint(); }

1 0

r943 - in trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing: . actions actions/util
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 23:09:54 +0000 (Wed, 13 Feb 2008) New Revision: 943 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java Log: il faut invalider les arbres lors des op?\195?\169ration collapse- expand. TODO, faire que les paneaux ne changent pas de taille sur l'onglet de synchronisation Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-13 23:09:02 UTC (rev 942) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/SimExplorerTab.java 2008-02-13 23:09:54 UTC (rev 943) @@ -21,7 +21,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.SynchronizeTabModel; -import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTab; import jaxx.runtime.builder.TabContentConfig; import jaxx.runtime.builder.TabFactory; import jaxx.runtime.builder.TabModel; @@ -82,8 +82,8 @@ return factory; } - public JAXXObject getUI() { - return (JAXXObject) getFactory().getUI(name()); + public JAXXTab getUI() { + return (JAXXTab) getFactory().getUI(name()); } public TabModel getModel() { @@ -91,12 +91,12 @@ } public boolean isTabVisible(JTabbedPane container) { - JAXXObject ui = getUI(); + JAXXTab ui = getUI(); return ui != null && getFactory().getTabIndex(container, (JComponent) ui) > -1; } public int getTabIndex(JTabbedPane container) { - JAXXObject ui = getUI(); + JAXXTab ui = getUI(); return ui == null ? -1 : getFactory().getTabIndex(container, (JComponent) ui); } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-13 23:09:02 UTC (rev 942) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/CollapseAllAction.java 2008-02-13 23:09:54 UTC (rev 943) @@ -18,13 +18,14 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; +import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractTabAction; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeHelper; import fr.cemagref.simexplorer.is.ui.swing.model.LoggableElementTreeNode; -import fr.cemagref.simexplorer.is.ui.swing.JDetailTab; -import fr.cemagref.simexplorer.is.ui.swing.JSynchronizeTab; import javax.swing.JTree; +import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; /** @@ -55,7 +56,7 @@ protected boolean beforeAction(ActionEvent e) throws Exception { if (!super.beforeAction(e)) { return false; - } + } String actionName = getActionName(); // on retrouve l'arbre concerné à partir du nom de l'action if ("collapseAllDetail".equals(actionName)) { @@ -68,7 +69,7 @@ JSynchronizeTab ui = (JSynchronizeTab) getUI(); tree = ui.getContentTreeRemote(); } - if (tree==null) { + if (tree == null) { // arbre non trouvé (cela devrait souleve une exception !) return false; } @@ -80,11 +81,18 @@ @Override protected void doAction(ActionEvent e) throws Exception { - node.collaspeAll(tree); } @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + tree.invalidate(); + getUI().repaint(); + getMainUI().repaint(); + } + + @Override protected void clear() { super.clear(); tree = null; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-13 23:09:02 UTC (rev 942) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ExpandAllAction.java 2008-02-13 23:09:54 UTC (rev 943) @@ -86,6 +86,14 @@ } @Override + protected void afterAction(ActionEvent e) throws Exception { + super.afterAction(e); + tree.invalidate(); + getUI().repaint(); + getMainUI().repaint(); + } + + @Override protected void clear() { super.clear(); tree = null; Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-13 23:09:02 UTC (rev 942) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/ShowListTabAbstractAction.java 2008-02-13 23:09:54 UTC (rev 943) @@ -31,7 +31,7 @@ import fr.cemagref.simexplorer.is.ui.swing.model.DetailTabModel; import fr.cemagref.simexplorer.is.ui.swing.model.JApplicationTableModel; import fr.cemagref.simexplorer.is.ui.swing.model.ListTabModel; -import jaxx.runtime.JAXXObject; +import jaxx.runtime.swing.JAXXTab; import javax.swing.AbstractAction; import javax.swing.AbstractButton; @@ -61,7 +61,7 @@ protected boolean beforeAction(ActionEvent e) throws Exception { super.beforeAction(e); JTabbedPane tabbedPane = getTabContainer(); - JAXXObject ui = getUI(); + JAXXTab ui = getUI(); if (getTab().isTabVisible(tabbedPane)) { // tab is already visible, just select it Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-02-13 23:09:02 UTC (rev 942) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/util/SimExplorerAbstractTabAction.java 2008-02-13 23:09:54 UTC (rev 943) @@ -19,6 +19,7 @@ package fr.cemagref.simexplorer.is.ui.swing.actions.util; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import jaxx.runtime.swing.JAXXTab; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabModel; import org.apache.commons.beanutils.Converter; @@ -93,7 +94,7 @@ return tab; } - public JAXXObject getUI() { + public JAXXTab getUI() { return getTab().getUI(); } @@ -108,7 +109,7 @@ } protected JComponent getUIObject(String name) { - return getUIObject(name, getUI()); + return getUIObject(name, (JAXXObject) getUI()); } protected void setTab(SimExplorerTab tab) {

1 0

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

13 Feb '08

Author: tchemit Date: 2008-02-13 23:09:02 +0000 (Wed, 13 Feb 2008) New Revision: 942 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx Log: amelioration ui Modified: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-13 22:47:04 UTC (rev 941) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/JDetailTab.jaxx 2008-02-13 23:09:02 UTC (rev 942) @@ -70,9 +70,9 @@ <cell anchor='west'> <JLabel text='simexplorer.common.version'/> </cell> - <cell weightx="1" anchor='west' fill="both"> + <cell weightx="1" anchor='west' fill="horizontal"> <Table> - <row fill="both"> + <row fill="horizontal"> <cell anchor="west"> <JComboBox id='detailVersions' model='{new DefaultComboBoxModel()}'/> </cell>

1 0

r941 - trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 22:47:04 +0000 (Wed, 13 Feb 2008) New Revision: 941 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java Log: inline variables Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-02-13 22:45:06 UTC (rev 940) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-02-13 22:47:04 UTC (rev 941) @@ -588,8 +588,7 @@ public Group[] getGroups(String token) throws SimExplorerServiceException { if (canViewElements(token)) { List<Group> groups = dao.getGroups(); - Group[] result = groups.toArray(new Group[groups.size()]); - return result; + return groups.toArray(new Group[groups.size()]); } throw new SimExplorerServiceException(_("simexplorer.service.security.norights")); } @@ -600,8 +599,7 @@ public Group[] getGroupsOwnedBy(String token, User user) throws SimExplorerServiceException { if (canViewElements(token)) { List<Group> list = dao.getGroupsOwnedBy(user); - Group[] groups = list.toArray(new Group[list.size()]); - return groups; + return list.toArray(new Group[list.size()]); } throw new SimExplorerServiceException(_("simexplorer.service.security.norights")); } @@ -612,8 +610,7 @@ public User[] getUsers(String token) throws SimExplorerServiceException { if (canViewElements(token)) { List<User> users = dao.getUsers(); - User[] arrayUsers = users.toArray(new User[users.size()]); - return arrayUsers; + return users.toArray(new User[users.size()]); } throw new SimExplorerServiceException(_("simexplorer.service.security.norights")); } @@ -624,8 +621,7 @@ public User[] getUsersOfGroup(String token, Group group) throws SimExplorerServiceException { if (canViewElements(token)) { List<User> usersOfGroup = dao.getUsersOfGroup(group); - User[] array = usersOfGroup.toArray(new User[usersOfGroup.size()]); - return array; + return usersOfGroup.toArray(new User[usersOfGroup.size()]); } throw new SimExplorerServiceException(_("simexplorer.service.security.norights")); }

1 0

r940 - in trunk/simexplorer-is/simexplorer-is-swing/src: java/fr/cemagref/simexplorer/is/ui/swing/actions resources/i18n uimodel/fr/cemagref/simexplorer/is/ui/swing
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 22:45:06 +0000 (Wed, 13 Feb 2008) New Revision: 940 Added: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties Log: action de connexion ok Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-13 22:21:29 UTC (rev 939) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-13 22:45:06 UTC (rev 940) @@ -18,12 +18,17 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.actions; +import fr.cemagref.simexplorer.is.service.AuthenticationServiceHelper; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.ui.SimExplorerRuntimeException; +import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; +import fr.cemagref.simexplorer.is.ui.swing.LoginUI; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; import fr.cemagref.simexplorer.is.ui.swing.actions.util.SimExplorerAbstractAction; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerUIRefreshHelper; -import fr.cemagref.simexplorer.is.ui.StorageServiceHelper; +import static org.codelutin.i18n.I18n._; +import javax.swing.JOptionPane; import java.awt.event.ActionEvent; /** @@ -43,11 +48,11 @@ ) public class ConnectAction extends SimExplorerAbstractAction { + LoginUI ui; + MyLoginUIHandler loginUIHandler; + private static final long serialVersionUID = -6172528731543675359L; - String login; - String password; - public ConnectAction(String name) { super(name); } @@ -57,41 +62,85 @@ if (getContext().isConnected()) { return false; } - - login = getContext().getConfig().getRemoteLogin(); - password = getContext().getConfig().getRemotePassword(); - if (login == null || password == null) { - //TODO show login ui - password = "password"; - getContext().getConfig().setRemotePassword(password); - } + initLoginUI(); return true; } @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); - StorageService service = StorageServiceHelper.getService(getContext(),true); - - try { - String token = service.loginUser(login, password); - getContext().setToken(token); - } catch (SimExplorerServiceException e1) { - //TODO alert user of error - log.warn("could not connect user for reason " + e1.getMessage()); - throw e1; + String login = getContext().getConfig().getRemoteLogin(); + String hashPassword = getContext().getConfig().getRemotePassword(); + if (hashPassword == null || hashPassword.length()==0 || !loginUIHandler.connect(login, hashPassword)) { + ui.launch(login); } } @Override protected void afterAction(ActionEvent e) throws Exception { - SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), true); + SimExplorerUIRefreshHelper.refreshConnnectState(getMainUI(), getContext().isConnected()); } @Override protected void clear() { super.clear(); - login = null; - password = null; } + + protected void initLoginUI() { + if (ui == null) { + loginUIHandler = new MyLoginUIHandler(); + ui = new LoginUI(getMainUI(), loginUIHandler); + } + } + + private class MyLoginUIHandler extends LoginUI.LoginUIHandler { + /** + * Tente de se connecter au service. + * <p/> + * Le mot de passe hashé est sauvegardé. + * <p/> + * Si l'utilisateur abandonne l'opération, alors on reset le mot de + * passe hashé dans la config et on sauvegarde la config. + * + * @param login le login de l'utilisateur + * @param password le password hashé de l'utilisateur + * @return <code>true</code> si l'utilisateur est connecté + */ + protected boolean connect(String login, String password) { + StorageService service = StorageServiceHelper.getService(getContext(), true); + String token; + try { + token = service.loginUser(login, password); + } catch (SimExplorerServiceException e) { + token = null; + } + getContext().setToken(token); + boolean isConnected = getContext().isConnected(); + if (isConnected) { + // keep login and password + getContext().getConfig().setRemoteLogin(login); + getContext().getConfig().setRemotePassword(password); + } else { + // delete login and password + getContext().getConfig().setRemoteLogin(null); + getContext().getConfig().setRemotePassword(null); + } + //Save configuration, I don't like it, but required by client... + getContext().getConfig().saveSafely(); + return isConnected; + } + + protected boolean connect(String login, char[] password) { + try { + return connect(login, AuthenticationServiceHelper.computeHash(password)); + } catch (SimExplorerServiceException e) { + throw new SimExplorerRuntimeException(e); + } + } + + protected boolean failedToConnect() { + int result = JOptionPane.showConfirmDialog(ui, _("simexplorer.login.retry"), _("simexplorer.login.failed"), JOptionPane.YES_NO_OPTION, JOptionPane.ERROR_MESSAGE); + return result == JOptionPane.NO_OPTION; + } + } } \ No newline at end of file Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-13 22:21:29 UTC (rev 939) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-en_GB.properties 2008-02-13 22:45:06 UTC (rev 940) @@ -117,13 +117,16 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Disconnect from remote server simexplorer.change.config.property= +simexplorer.common.apply= simexplorer.common.cancel= simexplorer.common.close=Close simexplorer.common.creationDate=create date simexplorer.common.description=description simexplorer.common.key=key +simexplorer.common.login= simexplorer.common.name=name simexplorer.common.ok= +simexplorer.common.passphrase= simexplorer.common.type=type simexplorer.common.value=value simexplorer.common.version=version @@ -153,6 +156,9 @@ simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Help +simexplorer.login.failed= +simexplorer.login.retry= +simexplorer.login.title= simexplorer.main.menu=Main simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-13 22:21:29 UTC (rev 939) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/i18n/simexplorer-is-swing-fr_FR.properties 2008-02-13 22:45:06 UTC (rev 940) @@ -117,13 +117,16 @@ simexplorer.action.unconnect.help= simexplorer.action.unconnect.tooltip=Se d\u00E9connecter du serveur distant simexplorer.change.config.property= +simexplorer.common.apply=Appliquer simexplorer.common.cancel=Annuler simexplorer.common.close=Fermer simexplorer.common.creationDate=date de cr\u00E9ation simexplorer.common.description=description simexplorer.common.key=nom descriptor +simexplorer.common.login=Login utilisateur simexplorer.common.name=nom simexplorer.common.ok=Ok +simexplorer.common.passphrase=Mot de passe simexplorer.common.type=type simexplorer.common.value=valeur simexplorer.common.version=version @@ -153,6 +156,9 @@ simexplorer.error.load.actions.file=could not load actions.properties file for reason {0} simexplorer.error.unfound.config.property= simexplorer.help.menu=Aide +simexplorer.login.failed=L'authentification a \u00E9chou\u00E9e +simexplorer.login.retry=Voulez-vous ressayer de vous connecter ? +simexplorer.login.title=Connexion au serveur central simexplorer.main.menu=Menu principal simexplorer.main.ui.title=SimExplorer SI v 0.0.1 simexplorer.message.reset.user.configuration= Added: trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx (rev 0) +++ trunk/simexplorer-is/simexplorer-is-swing/src/uimodel/fr/cemagref/simexplorer/is/ui/swing/LoginUI.jaxx 2008-02-13 22:45:06 UTC (rev 940) @@ -0,0 +1,89 @@ +<JDialog title='simexplorer.login.title' modal='true'> + <script> + public static abstract class LoginUIHandler { + + boolean cancel; + LoginUI ui; + + protected abstract boolean connect(String login,char[] password); + + protected abstract boolean failedToConnect(); + + public void doConnect() { + cancel = false; + if (!connect(ui.getLogin().getText(),ui.getPassword().getPassword())) { + if (failedToConnect()) { + cancel = true; + } + } else { + cancel = true; + } + } + + public void doCancel() { + cancel = false; + ui.login.setText(null); + ui.password.setText(null); + } + + protected void setUi(LoginUI ui) { + this.ui = ui; + } + } + + protected LoginUIHandler handler; + + public boolean launch(String login) { + if (login != null) { + this.getLogin().setText(login); + } + setVisible(true); + return !handler.cancel; + } + + public LoginUI(JFrame instance, LoginUIHandler handler) { + super(instance); + this.handler = handler; + this.handler.setUi(this); + // block close operation + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); + } + protected void doConnect() { + handler.doConnect(); + if (handler.cancel) { + doCancel(); + } + } + + protected void doCancel() { + handler.doCancel(); + dispose(); + } + </script> + <Table> + <row fill='horizontal'> + <cell> + <JLabel text='simexplorer.common.login' labelFor='{login}'/> + </cell> + <cell> + <JTextField id='login' onKeyReleased='ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0)'/> + </cell> + </row> + <row fill='horizontal'> + <cell> + <JLabel text='simexplorer.common.passphrase' labelFor='{password}'/> + </cell> + <cell> + <JPasswordField id='password' onKeyReleased='ok.setEnabled(login.getText().trim().length()>0 && password.getPassword().length>0)'/> + </cell> + </row> + <row fill='horizontal'> + <cell columns="2"> + <JPanel layout='{new GridLayout(0, 2, 2, 2)}'> + <JButton id='ok' text='simexplorer.common.apply' onActionPerformed="doConnect()" enabled='false'/> + <JButton text='simexplorer.common.cancel' onActionPerformed="doCancel()"/> + </JPanel> + </cell> + </row> + </Table> +</JDialog>

1 0

r939 - trunk/simexplorer-is/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 22:21:29 +0000 (Wed, 13 Feb 2008) New Revision: 939 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Log: pas de login par defaut Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-13 22:01:10 UTC (rev 938) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-13 22:21:29 UTC (rev 939) @@ -57,7 +57,7 @@ ### ### Remote service configuration ### -main.config.definition.remoteLogin=java.lang.String:anonymous +main.config.definition.remoteLogin=java.lang.String main.config.modifiers.remoteLogin=mandatory main.config.definition.remotePassword=java.lang.String

1 0

r938 - trunk/simexplorer-is/simexplorer-is-swing/src/resources
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 22:01:10 +0000 (Wed, 13 Feb 2008) New Revision: 938 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Log: on autorise la sauvegarde du hash du password, meme si c pas bien a mon gout Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-13 22:00:14 UTC (rev 937) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-13 22:01:10 UTC (rev 938) @@ -61,7 +61,7 @@ main.config.modifiers.remoteLogin=mandatory main.config.definition.remotePassword=java.lang.String -main.config.modifiers.remotePassword=transient +main.config.modifiers.remotePassword= main.config.definition.remoteURI=java.net.URI:jnp://localhost:1099 main.config.modifiers.remoteURI=final,static,mandatory

1 0

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

13 Feb '08

Author: tchemit Date: 2008-02-13 22:00:14 +0000 (Wed, 13 Feb 2008) New Revision: 937 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java Log: ajout TODO Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-13 21:58:03 UTC (rev 936) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-13 22:00:14 UTC (rev 937) @@ -38,7 +38,7 @@ @Persist private String user; - /** The password. */ + /** The password.TODO voir si on peut utiliser directement un char[] */ private String password; /** The login. */

1 0

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

13 Feb '08

Author: tchemit Date: 2008-02-13 21:58:03 +0000 (Wed, 13 Feb 2008) New Revision: 936 Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java Log: ne pas utiliser les password en clair dans des String, il faut utiliser des tableaux de char. de plus on transmet dans l'appel loginUser, le password deja hash?\195?\169 + formatage Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-13 21:57:42 UTC (rev 935) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/pages/Login.java 2008-02-13 21:58:03 UTC (rev 936) @@ -17,6 +17,10 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.web.pages; +import fr.cemagref.simexplorer.is.service.AuthenticationServiceHelper; +import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; +import fr.cemagref.simexplorer.is.ui.web.SimExplorerWebException; +import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Component; import org.apache.tapestry.annotations.InjectPage; @@ -25,13 +29,9 @@ 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; -import fr.cemagref.simexplorer.is.ui.web.services.RemoteSecurityService; +import java.util.Arrays; -/** - * The Class Login. - */ +/** The Class Login. */ public class Login { /** The user. */ @@ -65,13 +65,19 @@ /** * On success. - * + * * @return the object */ public Object onSuccessFromFormLogin() { try { - token = RemoteSecurityService.getAuthentificationService() - .loginUser(user, password); + // on hache directement le password pour ne pas le transmettre en clair + char[] chars = password.toCharArray(); + String pass = AuthenticationServiceHelper.computeHash(chars); + // reset du tableau + Arrays.fill(chars, (char) 0); + //TODO verifier que cela est ok + password = null; + token = RemoteSecurityService.getAuthentificationService().loginUser(user, pass); if (token != null && !token.equals("")) { return elementList; } @@ -85,7 +91,7 @@ /** * On success from form request account. - * + * * @return the object */ public Object onSuccessFromFormRequestAccount() { @@ -100,7 +106,7 @@ /** * Gets the user. - * + * * @return the user */ public String getUser() { @@ -109,9 +115,8 @@ /** * Sets the user. - * - * @param user - * the new user + * + * @param user the new user */ public void setUser(String user) { this.user = user; @@ -119,7 +124,7 @@ /** * Gets the password. - * + * * @return the password */ public String getPassword() { @@ -128,9 +133,8 @@ /** * Sets the password. - * - * @param password - * the new password + * + * @param password the new password */ public void setPassword(String password) { this.password = password; @@ -138,7 +142,7 @@ /** * Gets the element list. - * + * * @return the element list */ public ElementList getElementList() { @@ -147,7 +151,7 @@ /** * Gets the window title. - * + * * @return the window title */ public String getWindowTitle() { @@ -156,7 +160,7 @@ /** * Gets the login. - * + * * @return the login */ public String getLogin() { @@ -165,9 +169,8 @@ /** * Sets the login. - * - * @param login - * the new login + * + * @param login the new login */ public void setLogin(String login) { this.login = login; @@ -175,7 +178,7 @@ /** * Gets the mail. - * + * * @return the mail */ public String getMail() { @@ -184,9 +187,8 @@ /** * Sets the mail. - * - * @param mail - * the new mail + * + * @param mail the new mail */ public void setMail(String mail) { this.mail = mail;

1 0