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

r484 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 11:09:10 +0000 (Thu, 24 Jan 2008) New Revision: 484 Removed: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java Log: suppression interface inutile Deleted: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java 2008-01-24 11:08:58 UTC (rev 483) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/ActionParameter.java 2008-01-24 11:09:10 UTC (rev 484) @@ -1,24 +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.ui.swing.action; - -/** @author chemit */ -public interface ActionParameter { - String getParam(); -}

1 0

r483 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 11:08:58 +0000 (Thu, 24 Jan 2008) New Revision: 483 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java Log: javadoc + normalisation nom storage service Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 10:39:32 UTC (rev 482) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 11:08:58 UTC (rev 483) @@ -18,10 +18,10 @@ * ##% */ package fr.cemagref.simexplorer.is.ui; +import fr.cemagref.simexplorer.is.security.service.AuthenticationService; +import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; +import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.actions.SimExplorerCommonActions; -import fr.cemagref.simexplorer.is.service.StorageService; -import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; -import fr.cemagref.simexplorer.is.security.service.AuthenticationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.option.ParserException; @@ -41,9 +41,10 @@ /** to use log facility, just put in your code: log.info(\"...\"); */ static private Log log = LogFactory.getLog(SimExplorerContext.class); + /** - * le parseur utilisaé au démarrage pour récupérer les options passées - * par l'utilisateur + * le parseur utilisé au démarrage pour récupérer les options passées + * par l'utilisateur. */ protected SimExplorerOptionParser parser; @@ -68,21 +69,26 @@ /** le service de données distant */ protected StorageService storageService; + /** le service d'authentification */ protected AuthenticationService authenticationService; + /** + * @return le parseur utilisé pour parser les options de la ligne de + * commande. + */ public SimExplorerOptionParser getParser() { if (parser == null) { // creation du parseur parser = new SimExplorerOptionParser(); // enregistrement des actions concretes parser.registerActions(SimExplorerCommonActions.class); - // enregistrement des configs concretes parser.registerConfig(SimExplorerConfig.class); } return parser; } + /** @return la configuration de l'application */ public SimExplorerConfig getConfig() { return (SimExplorerConfig) getParser().getMainConfig(); } @@ -95,6 +101,11 @@ return token == null || token.isEmpty(); } + /** + * Sauvegarde la configuration courante de l'utilisateur. + * + * @throws IOException si problème lors de l'écriture du fichier de configuration + */ public void save() throws IOException { if (getConfig().getSource() == null) { return; @@ -108,6 +119,10 @@ } } + /** + * Sauvegarde la configuration de l'utilisateur sans soulever d'exception + * si un problème est survenu lors de l'opération. + */ public void saveSafely() { try { save(); @@ -116,22 +131,64 @@ } } + /** + * @return <code>true</code> si on doit quitter l'application (uniquement utilisé + * lors du démarrage de l'application lors de l'exécution des options + * utilisateurs) + */ public boolean isQuit() { return quit; } + /** + * @return <code>true</code> si on doit lancer l'ui au démarrage de + * l'application, après avoir traité toutes les options utilisateurs + */ public boolean isLaunchUI() { return launchUI; } + /** + * @return <code>true</code> s'il s'agit de la première utilisation de + * l'application (aucun de fichier de configuration trouvé) + */ public boolean isFirstLaunch() { return firstLaunch; } + /** + * @return le token utilisé pour identifié l'utilisateur sur le serveur distant. + * <p/> + * <b>Si est null ou vide cela veut que l'utilisateur n'est pas connecté.</b> + */ public String getToken() { return token; } + /** @return le service de storage locale */ + public StorageService getLocalStorageService() { + if (storageService == null) { + storageService = new MockStorageServiceImpl(); + } + return storageService; + } + + /** @return le service de storage distant */ + public StorageService getRemoteStorageService() { + if (remoteStorageService == null) { + remoteStorageService = new MockStorageServiceImpl(); + } + return remoteStorageService; + } + + /** @return le service d'authentification */ + public AuthenticationService getAuthenticationService() { + if (authenticationService == null) { + //authenticationService = new AuthenticationService(); + } + return authenticationService; + } + public void setQuit(boolean quit) { this.quit = quit; } @@ -153,6 +210,11 @@ } + /** + * Initialisation du parseur d'options. + * + * @param args les arguments passés au démarrage de l'application + */ void initParser(String... args) { try { getParser().doParse(args); @@ -163,29 +225,8 @@ } } + /** Initialisation de la configuration utilisateur */ void initConfig() { getConfig().initI18n(); } - - - public StorageService getStorageService() { - if (storageService == null) { - storageService = new MockStorageServiceImpl(); - } - return storageService; - } - - public StorageService getRemoteStorageService() { - if (remoteStorageService == null) { - remoteStorageService = new MockStorageServiceImpl(); - } - return remoteStorageService; - } - - public AuthenticationService getAuthenticationService() { - if (authenticationService == null) { - //authenticationService = new AuthenticationService(); - } - return authenticationService; - } }

1 0

r482 - in trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui: . swing/action
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 10:39:32 +0000 (Thu, 24 Jan 2008) New Revision: 482 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/SimExplorerContext.java trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java Log: acc?\195?\168s aux services depui le context de l'appli 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-01-24 10:36:35 UTC (rev 481) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorer.java 2008-01-24 10:39:32 UTC (rev 482) @@ -18,12 +18,10 @@ * ##% */ package fr.cemagref.simexplorer.is.ui; -import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; -import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.ui.swing.JConfigUI; +import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerMainUI; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; -import fr.cemagref.simexplorer.is.ui.swing.SimExplorerActionManager; import org.codelutin.i18n.I18n; import org.codelutin.option.ui.ConfigTableModel; @@ -42,12 +40,6 @@ /** l'ui principale de l'application */ protected static SimExplorerMainUI ui; - /** le service de données local */ - private static StorageService remoteStorageService; - - /** le service de données distant */ - protected static StorageService storageService; - public static SimExplorerContext getContext() { checkInitContext(); return context; @@ -141,20 +133,6 @@ } - public static StorageService getStorageService() { - if (storageService == null) { - storageService = new MockStorageServiceImpl(); - } - return storageService; - } - - public static StorageService getRemoteStorageService() { - if (remoteStorageService == null) { - remoteStorageService = new MockStorageServiceImpl(); - } - return remoteStorageService; - } - protected static void checkInitContext() { if (context == null) { throw new SimExplorerRuntimeException("context is null, you must init first the " + SimExplorer.class.getName() + " class via init method"); Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 10:36:35 UTC (rev 481) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-01-24 10:39:32 UTC (rev 482) @@ -19,6 +19,9 @@ package fr.cemagref.simexplorer.is.ui; import fr.cemagref.simexplorer.is.ui.actions.SimExplorerCommonActions; +import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; +import fr.cemagref.simexplorer.is.security.service.AuthenticationService; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.option.ParserException; @@ -59,6 +62,14 @@ /** le token pour la connexion au serveur distant */ protected String token; + /** le service de données local */ + protected StorageService remoteStorageService; + + /** le service de données distant */ + protected StorageService storageService; + + protected AuthenticationService authenticationService; + public SimExplorerOptionParser getParser() { if (parser == null) { // creation du parseur @@ -76,6 +87,14 @@ return (SimExplorerConfig) getParser().getMainConfig(); } + /** + * @return <code>true</code> si l'utilisateur est connecté, + * <code>false</code> sinon. + */ + public boolean isConnected() { + return token == null || token.isEmpty(); + } + public void save() throws IOException { if (getConfig().getSource() == null) { return; @@ -147,4 +166,26 @@ void initConfig() { getConfig().initI18n(); } + + + public StorageService getStorageService() { + if (storageService == null) { + storageService = new MockStorageServiceImpl(); + } + return storageService; + } + + public StorageService getRemoteStorageService() { + if (remoteStorageService == null) { + remoteStorageService = new MockStorageServiceImpl(); + } + return remoteStorageService; + } + + public AuthenticationService getAuthenticationService() { + if (authenticationService == null) { + //authenticationService = new AuthenticationService(); + } + return authenticationService; + } } Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 10:36:35 UTC (rev 481) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/SimExplorerAbstractTabAction.java 2008-01-24 10:39:32 UTC (rev 482) @@ -21,8 +21,8 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; import fr.cemagref.simexplorer.is.service.StorageService; -import fr.cemagref.simexplorer.is.ui.SimExplorer; import fr.cemagref.simexplorer.is.ui.swing.SimExplorerTab; +import fr.cemagref.simexplorer.is.security.service.AuthenticationService; import jaxx.runtime.JAXXObject; import jaxx.runtime.builder.TabModel; import org.apache.commons.beanutils.Converter; @@ -107,17 +107,9 @@ protected int getCount(boolean remote, String token, String query) throws Exception { int size; if (query == null || query.isEmpty()) { - if (remote) { - size = SimExplorer.getRemoteStorageService().findApplicationsCount(token, false); - } else { - size = SimExplorer.getStorageService().findApplicationsCount(token, false); - } + size = getStorageService(remote).findApplicationsCount(token, false); } else { - if (remote) { - size = SimExplorer.getRemoteStorageService().findFullTextCount(token, query, false); - } else { - size = SimExplorer.getStorageService().findFullTextCount(token, query, false); - } + size = getStorageService(remote).findFullTextCount(token, query, false); } return size; } @@ -137,10 +129,14 @@ protected StorageService getStorageService(boolean remote) { StorageService service; - service = remote ? SimExplorer.getRemoteStorageService() : SimExplorer.getStorageService(); + service = remote ? getContext().getRemoteStorageService() : getContext().getStorageService(); return service; } + protected AuthenticationService getAuthenticationService() { + return getContext().getAuthenticationService(); + } + protected LoggableElement getElement(boolean remote, String uuid, String version) throws Exception { StorageService service = getStorageService(remote); LoggableElement data;

1 0

r481 - in trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security: dao service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 10:36:35 +0000 (Thu, 24 Jan 2008) New Revision: 481 Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java Log: tip : ne pas faire d'appel "string1" == "string2", m?\195?\170me si cela fonctionne, fortement d?\195?\169conseill?\195?\169... + nettoyage code Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-24 10:33:53 UTC (rev 480) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/dao/DaoSecurityImpl.java 2008-01-24 10:36:35 UTC (rev 481) @@ -46,7 +46,7 @@ return o; } - private Object find(Class clazz, Object arg) { + private Object find(Class<?> clazz, Object arg) { Object o; try { o = em.find(clazz, arg); Modified: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-24 10:33:53 UTC (rev 480) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/AuthenticationServiceImpl.java 2008-01-24 10:36:35 UTC (rev 481) @@ -22,8 +22,8 @@ import java.util.Date; import java.util.List; import java.util.UUID; +import java.util.Arrays; -import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.ejb.EJB; import javax.ejb.Remote; @@ -34,7 +34,6 @@ import javax.ejb.TimerService; import javax.ejb.TransactionAttribute; import javax.ejb.TransactionAttributeType; -import javax.interceptor.InvocationContext; import org.jboss.annotation.ejb.RemoteBinding; @@ -83,7 +82,8 @@ } messageDigest.reset(); messageDigest.update(clearString.getBytes()); - String hashedPassword = new String(messageDigest.digest()); + String hashedPassword; + hashedPassword = new String(messageDigest.digest()); return hashedPassword; } @@ -95,7 +95,7 @@ private void removeUserFromGroup(User user, Group group) { List<Group> toRemove = new ArrayList<Group>(); for (Group testGroup : user.getGroups()) { - if (testGroup.getId() == group.getId()) { + if (testGroup.getId().equals(group.getId())) { toRemove.add(testGroup); } } @@ -161,7 +161,8 @@ } public User getLoggedUser(String token) { - User loggedUser = dao.getLoggedUser(token); + User loggedUser; + loggedUser = dao.getLoggedUser(token); return loggedUser; } @@ -239,28 +240,29 @@ public Group[] getGroups(String token) { List<Group> groups = dao.getGroups(); - Group[] result = groups.toArray(new Group[groups.size()]); + Group[] result; + result = groups.toArray(new Group[groups.size()]); return result; } public Group[] getGroupsOwnedBy(String token, User user) { - return dao.getGroupsOwnedBy(user).toArray(new Group[0]); + List<Group> list = dao.getGroupsOwnedBy(user); + return list.toArray(new Group[list.size()]); } public User[] getUsers(String token) { - return dao.getUsers().toArray(new User[0]); + return dao.getUsers().toArray(new User[dao.getUsers().size()]); } public User[] getUsersOfGroup(String token, Group group) { - return dao.getUsersOfGroup(group).toArray(new User[0]); + List<User> usersOfGroup = dao.getUsersOfGroup(group); + return usersOfGroup.toArray(new User[usersOfGroup.size()]); } public void setUsersOfGroup(String token, Group group, Integer[] usersInGroup) { List<Integer> newUsers = new ArrayList<Integer>(); - for (int i = 0; i < usersInGroup.length; i++) { - newUsers.add(usersInGroup[i]); - } + newUsers.addAll(Arrays.asList(usersInGroup)); List<Integer> usersToAdd = new ArrayList<Integer>(); List<Integer> usersToRemove = new ArrayList<Integer>(); @@ -298,8 +300,8 @@ public void setGroupsOfUser(String token, User user, Integer[] groupsIds) { User realUser = dao.getUser(user.getId()); realUser.getGroups().clear(); - for (int i = 0; i < groupsIds.length; i++) { - Group group = dao.getGroup(groupsIds[i]); + for (Integer groupsId : groupsIds) { + Group group = dao.getGroup(groupsId); realUser.getGroups().add(group); } dao.updateUser(realUser); @@ -307,18 +309,20 @@ } public Group[] getGroupsOfUser(String token, User user) { - return dao.getGroupsOfUser(user).toArray(new Group[0]); + List<Group> list = dao.getGroupsOfUser(user); + return list.toArray(new Group[list.size()]); } public Group[] getGroupsOfGroup(String token, Group group) { - return dao.getGroupsOfGroup(group).toArray(new Group[0]); + List<Group> groupsOfGroup = dao.getGroupsOfGroup(group); + return groupsOfGroup.toArray(new Group[groupsOfGroup.size()]); } public void setGroupsOfGroup(String token, Group group, Integer[] groupsIds) { Group realGroup = dao.getGroup(group.getId()); realGroup.getGroups().clear(); - for (int i = 0; i < groupsIds.length; i++) { - Group groupOwned = dao.getGroup(groupsIds[i]); + for (Integer groupsId : groupsIds) { + Group groupOwned = dao.getGroup(groupsId); realGroup.getGroups().add(groupOwned); } dao.updateGroup(realGroup);

1 0

r480 - trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 10:33:53 +0000 (Thu, 24 Jan 2008) New Revision: 480 Added: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/MockAuthenticationServiceImpl.java Log: un service mock?\195?\169 Added: trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/MockAuthenticationServiceImpl.java =================================================================== --- trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/MockAuthenticationServiceImpl.java (rev 0) +++ trunk/simexplorer-is-security/src/java/fr/cemagref/simexplorer/is/security/service/MockAuthenticationServiceImpl.java 2008-01-24 10:33:53 UTC (rev 480) @@ -0,0 +1,130 @@ +/* +* ##% Copyright (C) 2008 Code Lutin, Tony Chemit, Gabriel Landais +* +* 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.security.service; + +import fr.cemagref.simexplorer.is.security.entities.Group; +import fr.cemagref.simexplorer.is.security.entities.User; + + +public class MockAuthenticationServiceImpl implements AuthenticationService { + + + public String loginUser(String login, String password) { + return (String) checkImplemented(); + } + + public void closeSessionTimer(String token) { + checkImplemented(); + } + + public User requestAccount(String login, String mail) { + return (User) checkImplemented(); + } + + public User saveUser(String token, String login, String mail) { + return (User) checkImplemented(); + } + + public void resetPassword(String token, String login) { + checkImplemented(); + } + + public void changePassword(String token, String login, String password) { + checkImplemented(); + } + + public User getUser(String token, Integer id) { + return (User) checkImplemented(); + } + + public User getUser(String token, String login) { + return (User) checkImplemented(); + } + + public User updateUser(String token, User user) { + return (User) checkImplemented(); + } + + public void deleteUser(String token, Integer id) { + checkImplemented(); + } + + public User[] getUsers(String token) { + return (User[]) checkImplemented(); + } + + public User[] getUsersOfGroup(String token, Group group) { + return (User[]) checkImplemented(); + } + + public void setUsersOfGroup(String token, Group group, Integer[] usersInGroup) { + checkImplemented(); + } + + public void setGroupsOfGroup(String token, Group group, Integer[] groupsIds) { + checkImplemented(); + } + + public Group[] getGroupsOfUser(String token, User user) { + return (Group[]) checkImplemented(); + } + + public Group[] getGroupsOfGroup(String token, Group group) { + return (Group[]) checkImplemented(); + } + + public void setGroupsOfUser(String token, User user, Integer[] groupsIds) { + checkImplemented(); + } + + public Group saveGroup(String token, String name, User owner) { + return (Group) checkImplemented(); + } + + public Group getGroup(String token, Integer id) { + return (Group) checkImplemented(); + } + + public Group getGroup(String token, String name) { + return (Group) checkImplemented(); + } + + public Group updateGroup(String token, Group group) { + return (Group) checkImplemented(); + } + + public void deleteGroup(String token, Integer id) { + checkImplemented(); + } + + public Group[] getGroups(String token) { + return (Group[]) checkImplemented(); + } + + public Group[] getGroupsOwnedBy(String token, User user) { + return (Group[]) checkImplemented(); + } + + public User getLoggedUser(String token) { + return (User) checkImplemented(); + } + + private Object checkImplemented() { + throw new IllegalStateException("not implemented"); + } +} \ No newline at end of file

1 0

r479 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 09:36:07 +0000 (Thu, 24 Jan 2008) New Revision: 479 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java Log: gabriel ? where are you ? Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 00:49:15 UTC (rev 478) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 09:36:07 UTC (rev 479) @@ -87,12 +87,13 @@ return false; } - element = (LoggableElement) node.getUserObject(); - - uuid = element.getMetaData().getUuid(); - version = element.getMetaData().getVersion(); - file = new File(FILENAME_PATTERN.format(uuid + "-" + version)); + //Object obj= node.getUserObject(); + //element = (LoggableElement) node.getUserObject(); + //uuid = element.getMetaData().getUuid(); + //version = element.getMetaData().getVersion(); + //file = new File(FILENAME_PATTERN.format(new Object[]{uuid + "-" + version})); } + result=false; return result; }

1 0

r478 - trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:49:15 +0000 (Thu, 24 Jan 2008) New Revision: 478 Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java Log: action presque termin?\195?\169e Modified: trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java =================================================================== --- trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 00:36:05 UTC (rev 477) +++ trunk/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/action/application/DownloadAction.java 2008-01-24 00:49:15 UTC (rev 478) @@ -18,6 +18,8 @@ * ##% */ package fr.cemagref.simexplorer.is.ui.swing.action.application; +import com.healthmarketscience.rmiio.RemoteInputStream; +import com.healthmarketscience.rmiio.RemoteInputStreamClient; import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.service.StorageService; @@ -29,7 +31,11 @@ import javax.swing.JTree; import java.awt.event.ActionEvent; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; import java.io.File; +import java.io.FileOutputStream; +import java.io.InputStream; import java.text.MessageFormat; /** @@ -57,6 +63,7 @@ LoggableElement element; String uuid; Version version; + private static final int BUFFER_SIZE = 8 * 1024; public DownloadAction(String name) { super(name, null); @@ -92,9 +99,32 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); - //StorageService service = getStorageService(((DetailTabModel) getModel()).isRemote()); - //TODO Where to save ??? - + StorageService service = getStorageService(((DetailTabModel) getModel()).isRemote()); + RemoteInputStream ris = service.retrieveData(getContext().getToken(), uuid, version.toString(), "_xml"); + if (ris == null) { + // todo log error + log.warn("could not get incoming data for " + uuid); + return; + } + InputStream stream = RemoteInputStreamClient.wrap(ris); + FileOutputStream fos = new FileOutputStream(file); + BufferedInputStream bis = new BufferedInputStream(stream); + BufferedOutputStream bos = new BufferedOutputStream(fos); + try { + byte[] buffer = new byte[BUFFER_SIZE]; + while (bis.read(buffer, 0, BUFFER_SIZE) != -1) { + bos.write(buffer); + bos.flush(); + } + } finally { + if (bis != null) { + bis.close(); + } + if (bos != null) { + bos.flush(); + bos.close(); + } + } } @Override @@ -104,7 +134,7 @@ node = null; file = null; element = null; - version=null; - uuid=null; + version = null; + uuid = null; } } \ No newline at end of file

1 0

r477 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:36:05 +0000 (Thu, 24 Jan 2008) New Revision: 477 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java Log: pourquoi moi ? Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 00:35:40 UTC (rev 476) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-01-24 00:36:05 UTC (rev 477) @@ -18,6 +18,8 @@ package fr.cemagref.simexplorer.is.service; import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import com.healthmarketscience.rmiio.RemoteInputStream; public class StorageServiceClient extends StorageServiceCommon { @@ -30,4 +32,14 @@ return null; } + public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { + //TODO + return null; + } + + public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { + //TODO + return new MetaDataEntity[0]; + } + } Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 00:35:40 UTC (rev 476) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceServer.java 2008-01-24 00:36:05 UTC (rev 477) @@ -25,6 +25,8 @@ import fr.cemagref.simexplorer.is.security.service.AuthenticationService; import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; +import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; +import com.healthmarketscience.rmiio.RemoteInputStream; @Stateless(name = "StorageService") @Remote(StorageService.class) @@ -52,4 +54,14 @@ return token; } + public RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception { + //TODO + return null; + } + + public MetaDataEntity[] getVersions(String token, String uuid) throws Exception { + //TODO + return new MetaDataEntity[0]; + } + }

1 0

r476 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:35:40 +0000 (Thu, 24 Jan 2008) New Revision: 476 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java Log: appel m?\195?\169thode statique toujours par la classe javadoc Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 00:34:07 UTC (rev 475) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceCommon.java 2008-01-24 00:35:40 UTC (rev 476) @@ -45,7 +45,6 @@ import fr.cemagref.simexplorer.is.factories.MetaDataEntityFactory; import fr.cemagref.simexplorer.is.factories.XmlConstants; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; -import fr.cemagref.simexplorer.is.storage.engine.StorageEngineImpl; public abstract class StorageServiceCommon implements StorageService, XmlConstants { @@ -195,6 +194,7 @@ /** * Real implementation of saveElement * + * @param token * @param idxml * @param idsattachment * @return @@ -308,7 +308,7 @@ .getXMLElementsByTagName(componentsElement, KEY_EXPLORATIONAPPLICATION_COMPONENT_NODE); for (Element element : componentElements) { - components.add(storageEngine.storeTempData(elementFactory + components.add(storageEngine.storeTempData(BaseEntityFactory .serializeElement(element))); } @@ -333,7 +333,7 @@ explorationDataArray = new String[1]; } explorationDataArray[0] = storageEngine - .storeTempData(elementFactory.serializeElement(elementAD)); + .storeTempData(BaseEntityFactory.serializeElement(elementAD)); explorationDatas.add(explorationDataArray); }

1 0

r475 - trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service
by tchemit＠users.labs.libre-entreprise.org 24 Jan '08

24 Jan '08

Author: tchemit Date: 2008-01-24 00:34:07 +0000 (Thu, 24 Jan 2008) New Revision: 475 Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java Log: import inutile + javadoc Modified: trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java =================================================================== --- trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 00:32:04 UTC (rev 474) +++ trunk/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageService.java 2008-01-24 00:34:07 UTC (rev 475) @@ -26,7 +26,6 @@ import fr.cemagref.simexplorer.is.entities.data.LoggableElement; import fr.cemagref.simexplorer.is.entities.metadata.MetaDataEntity; -import fr.cemagref.simexplorer.is.entities.metadata.Version; /** * Service interface @@ -58,6 +57,7 @@ /** * Save a remote element * + * @param token * @param zipRemoteStream * RIIO stream containing data inside a zip * @return Metadata of element imported @@ -69,6 +69,7 @@ /** * Save a remote element * + * @param token * @param xmlRemoteStream * RIIO stream containing XML Stream * @param attachmentsRemoteStream @@ -84,6 +85,7 @@ /** * Retrieve metadata (latest version) * + * @param token * @param uuid * @return * @throws Exception @@ -93,6 +95,7 @@ /** * Retrieve metadata * + * @param token * @param uuid * @param version * @return @@ -104,6 +107,7 @@ /** * Export element to a remote stream * + * @param token * @param xmlOutputStream * RMIIO stream where to save data * @param uuid @@ -118,8 +122,10 @@ * * @param token * @param uuid + * @param version * @param dataKey - * @param remoteStream + * @return + * @throws Exception */ RemoteInputStream retrieveData(String token, String uuid, String version, String dataKey) throws Exception; @@ -127,6 +133,7 @@ /** * Retrieve number of elements matching query * + * @param token * @param query * @param onlyLatest * @return @@ -138,6 +145,7 @@ /** * Find elements matching query * + * @param token * @param query * @param onlyLatest * @param indexStart @@ -153,6 +161,7 @@ /** * Retrieve number of applications * + * @param token * @param onlyLatest * @return * @throws Exception @@ -163,6 +172,7 @@ /** * Get a list of applications * + * @param token * @param onlyLatest * @param start * @param count @@ -176,6 +186,7 @@ /** * Fully load an element * + * @param token * @param uuid * @param version * @return @@ -190,6 +201,7 @@ * @param token * @param uuid * @return + * @throws Exception */ MetaDataEntity[] getVersions(String token, String uuid) throws Exception;

1 0