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

r935 - 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 21:57:42 +0000 (Wed, 13 Feb 2008) New Revision: 935 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.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 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 21:49:52 UTC (rev 934) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceImpl.java 2008-02-13 21:57:42 UTC (rev 935) @@ -19,8 +19,6 @@ import static org.codelutin.i18n.I18n._; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; @@ -75,11 +73,15 @@ * * @return the mail content with password */ - private String getMailContentWithPassword(String login, String password) { + private String getMailContentWithPassword(String login, char[] password) { StringBuffer sb = new StringBuffer(""); sb.append(_("simexplorer.service.mail.header")).append("\n"); sb.append(_("simexplorer.service.mail.login")).append(" : ").append(login).append("\n"); - sb.append(_("simexplorer.service.mail.password")).append(" : ").append(password).append("\n"); + sb.append(_("simexplorer.service.mail.password")).append(" : "); + for (char c : password) { + sb.append(c); + } + sb.append("\n"); sb.append(_("simexplorer.service.mail.footer")).append("\n"); return sb.toString(); } @@ -118,7 +120,6 @@ javax.mail.Message msg = new MimeMessage(mailSession); Address from = InternetAddress.parse(mailFrom)[0]; msg.setFrom(from); - ; msg.setRecipients(javax.mail.Message.RecipientType.TO, InternetAddress.parse(mailRecipient, false)); msg.setSubject(subject); msg.setContent(content, "text/plain"); @@ -133,35 +134,13 @@ } /** - * Compute hash. - * - * @param clearString the clear string - * - * @return the string - * - * @throws SimExplorerServiceException the sim explorer service exception - */ - private String computeHash(String clearString) throws SimExplorerServiceException { - MessageDigest messageDigest = null; - try { - messageDigest = MessageDigest.getInstance("SHA-1"); - } catch (NoSuchAlgorithmException e) { - throw new SimExplorerServiceException(e); - } - messageDigest.reset(); - messageDigest.update(clearString.getBytes()); - String hashedPassword; - hashedPassword = new String(messageDigest.digest()); - return hashedPassword; - } - - /** * Generate password. * * @return the string */ - private String generatePassword() { - return RandomStringUtils.randomAlphanumeric(10); + private char[] generatePassword() { + //TODO ne plus utiliser un String + return RandomStringUtils.randomAlphanumeric(10).toCharArray(); } /** @@ -196,7 +175,7 @@ * @return true, if successful */ private boolean userOwnerOfGroup(User loggedUser, Group group) { - if (group.getOwner().getId() == loggedUser.getId()) { + if (group.getOwner().getId().equals(loggedUser.getId())) { return true; } List<Group> groups = group.getGroups(); @@ -431,11 +410,13 @@ User user = new User(); user.setLogin(login); user.setMail(mail); - String password = generatePassword(); + char[] password = generatePassword(); sendMail(Config.getProperties().getProperty("simexplorer.adminmail"), mail, _("simexplorer.service.mail.subject"), getMailContentWithPassword(login, password)); - String passwordHash = computeHash(password); + String passwordHash = AuthenticationServiceHelper.computeHash(password); user.setPasswordHash(passwordHash); + // reset array + Arrays.fill(password,(char)0); user.setAdmin(false); user.setSuperAdmin(false); dao.saveUser(user); @@ -528,7 +509,7 @@ user.setLogin("superadmin"); user.setMail(""); String password = "password"; - String passwordHash = computeHash(password); + String passwordHash = AuthenticationServiceHelper.computeHash(password.toCharArray()); user.setPasswordHash(passwordHash); user.setAdmin(true); user.setSuperAdmin(true); @@ -546,7 +527,9 @@ superAdminCheck = true; } String token = null; - User loggedUser = dao.loginUser(login, computeHash(password)); + // le password est deja haché + //User loggedUser = dao.loginUser(login, AuthenticationServiceHelper.computeHash(password)); + User loggedUser = dao.loginUser(login, password); if (loggedUser != null) { // FIXME delete previous tokens // dao.deleteTokens(login, 10 * 60 * 1000); @@ -586,10 +569,12 @@ public void resetPassword(String token, String login) throws SimExplorerServiceException { User user = getUser(token, login); if (canAdminUser(token, user.getId())) { - String password = generatePassword(); + char[] password = generatePassword(); sendMail(Config.getProperties().getProperty("simexplorer.adminmail"), user.getMail(), _("simexplorer.service.mail.subject"), getMailContentWithPassword(login, password)); - String passwordHash = computeHash(password); + String passwordHash = AuthenticationServiceHelper.computeHash(password); + // reset char[] + Arrays.fill(password,(char)0); user.setPasswordHash(passwordHash); dao.updateUser(user); } else {

1 0

r934 - trunk/simexplorer-is/simexplorer-is-swing/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 21:49:52 +0000 (Wed, 13 Feb 2008) New Revision: 934 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java Log: unused import + on autorise loginUser uniquement si password non null Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-13 21:44:23 UTC (rev 933) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/service/MockStorageServiceImpl.java 2008-02-13 21:49:52 UTC (rev 934) @@ -18,7 +18,6 @@ * ##% */ 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; @@ -261,7 +260,7 @@ if (login == null) { throw new SimExplorerServiceException(new NullPointerException("login can not be null")); } - return "password"; + return password == null || password.length()==0 ? null : "abc"; } /* (non-Javadoc)

1 0

r933 - 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 21:44:23 +0000 (Wed, 13 Feb 2008) New Revision: 933 Added: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java Log: introduction helper pour authentication service Added: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java (rev 0) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationServiceHelper.java 2008-02-13 21:44:23 UTC (rev 933) @@ -0,0 +1,57 @@ +/* +* \#\#% Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 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.service; + +import org.codelutin.util.ConverterUtil; + +import java.security.MessageDigest; +import java.security.NoSuchAlgorithmException; + +/** @author chemit */ +public class AuthenticationServiceHelper { + + + protected AuthenticationServiceHelper() { + // no instance + } + + /** + * Compute hash. + * + * @param clearString the clear string + * + * @return the string + * + * @throws SimExplorerServiceException the sim explorer service exception + */ + public static String computeHash(char[] clearString) throws SimExplorerServiceException { + MessageDigest messageDigest; + try { + messageDigest = MessageDigest.getInstance("SHA-1"); + } catch (NoSuchAlgorithmException e) { + throw new SimExplorerServiceException(e); + } + messageDigest.reset(); + byte[] bytes = ConverterUtil.convert(clearString); + messageDigest.update(bytes); + String hashedPassword; + hashedPassword = new String(messageDigest.digest()); + return hashedPassword; + } +}

1 0

r932 - 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 21:40:56 +0000 (Wed, 13 Feb 2008) New Revision: 932 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java Log: reformat Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-02-13 16:43:46 UTC (rev 931) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/AuthenticationService.java 2008-02-13 21:40:56 UTC (rev 932) @@ -17,88 +17,67 @@ * ##% */ package fr.cemagref.simexplorer.is.service; -import javax.ejb.Remote; - import fr.cemagref.simexplorer.is.security.entities.Group; import fr.cemagref.simexplorer.is.security.entities.Permission; import fr.cemagref.simexplorer.is.security.entities.User; -/** - * The Interface AuthenticationService. - */ +import javax.ejb.Remote; + +/** The Interface AuthenticationService. */ @Remote public interface AuthenticationService { /** * Login user. - * - * @param login - * the login - * @param password - * the password - * + * + * @param login the login + * @param password the password * @return the string - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public String loginUser(String login, String password) throws SimExplorerServiceException; /** * Request account. - * - * @param login - * the login - * @param mail - * the mail - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param login the login + * @param mail the mail + * @throws SimExplorerServiceException the sim explorer service exception */ public void requestAccount(String login, String mail) throws SimExplorerServiceException; /** * Save user. - * - * @param token - * the token - * @param login - * the login - * @param mail - * the mail - * + * + * @param token the token + * @param login the login + * @param mail the mail * @return the user - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User saveUser(String token, String login, String mail) throws SimExplorerServiceException; /** * Reset password. - * - * @param token - * the token - * @param login - * the login - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param token the token + * @param login the login + * @throws SimExplorerServiceException the sim explorer service exception */ public void resetPassword(String token, String login) throws SimExplorerServiceException; /** * Change password. - * + * * @param token * the token * @param password * the password - * + * * @throws SimExplorerServiceException * the sim explorer service exception */ @@ -107,312 +86,218 @@ /** * Gets the user. - * - * @param token - * the token - * @param id - * the id - * + * + * @param token the token + * @param id the id * @return the user - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User getUser(String token, Integer id) throws SimExplorerServiceException; /** * Gets the user. - * - * @param token - * the token - * @param login - * the login - * + * + * @param token the token + * @param login the login * @return the user - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User getUser(String token, String login) throws SimExplorerServiceException; /** * Update user. - * - * @param token - * the token - * @param user - * the user - * + * + * @param token the token + * @param user the user * @return the user - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User updateUser(String token, User user) throws SimExplorerServiceException; /** * Delete user. - * - * @param token - * the token - * @param id - * the id - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param token the token + * @param id the id + * @throws SimExplorerServiceException the sim explorer service exception */ public void deleteUser(String token, Integer id) throws SimExplorerServiceException; /** * Gets the users. - * - * @param token - * the token - * + * + * @param token the token * @return the users - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User[] getUsers(String token) throws SimExplorerServiceException; /** * Gets the users of group. - * - * @param token - * the token - * @param group - * the group - * + * + * @param token the token + * @param group the group * @return the users of group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User[] getUsersOfGroup(String token, Group group) throws SimExplorerServiceException; /** * Sets the users of group. - * - * @param token - * the token - * @param group - * the group - * @param usersInGroup - * the users in group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param token the token + * @param group the group + * @param usersInGroup the users in group + * @throws SimExplorerServiceException the sim explorer service exception */ public void setUsersOfGroup(String token, Group group, - Integer[] usersInGroup) throws SimExplorerServiceException; + Integer[] usersInGroup) throws SimExplorerServiceException; /** * Sets the groups of group. - * - * @param token - * the token - * @param group - * the group - * @param groupsIds - * the groups ids - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param token the token + * @param group the group + * @param groupsIds the groups ids + * @throws SimExplorerServiceException the sim explorer service exception */ public void setGroupsOfGroup(String token, Group group, Integer[] groupsIds) throws SimExplorerServiceException; /** * Gets the groups of user. - * - * @param token - * the token - * @param user - * the user - * + * + * @param token the token + * @param user the user * @return the groups of user - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group[] getGroupsOfUser(String token, User user) throws SimExplorerServiceException; /** * Gets the groups of group. - * - * @param token - * the token - * @param group - * the group - * + * + * @param token the token + * @param group the group * @return the groups of group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group[] getGroupsOfGroup(String token, Group group) throws SimExplorerServiceException; /** * Sets the groups of user. - * - * @param token - * the token - * @param user - * the user - * @param groupsIds - * the groups ids - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param token the token + * @param user the user + * @param groupsIds the groups ids + * @throws SimExplorerServiceException the sim explorer service exception */ public void setGroupsOfUser(String token, User user, Integer[] groupsIds) throws SimExplorerServiceException; /** * Save group. - * - * @param token - * the token - * @param name - * the name - * + * + * @param token the token + * @param name the name * @return the group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group saveGroup(String token, String name) throws SimExplorerServiceException; /** * Gets the group. - * - * @param token - * the token - * @param id - * the id - * + * + * @param token the token + * @param id the id * @return the group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group getGroup(String token, Integer id) throws SimExplorerServiceException; /** * Gets the group. - * - * @param token - * the token - * @param name - * the name - * + * + * @param token the token + * @param name the name * @return the group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group getGroup(String token, String name) throws SimExplorerServiceException; /** * Update group. - * - * @param token - * the token - * @param group - * the group - * + * + * @param token the token + * @param group the group * @return the group - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group updateGroup(String token, Group group) throws SimExplorerServiceException; /** * Delete group. - * - * @param token - * the token - * @param id - * the id - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * + * @param token the token + * @param id the id + * @throws SimExplorerServiceException the sim explorer service exception */ public void deleteGroup(String token, Integer id) throws SimExplorerServiceException; /** * Gets the groups. - * - * @param token - * the token - * + * + * @param token the token * @return the groups - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group[] getGroups(String token) throws SimExplorerServiceException; /** * Gets the groups owned by. - * - * @param token - * the token - * @param user - * the user - * + * + * @param token the token + * @param user the user * @return the groups owned by - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public Group[] getGroupsOwnedBy(String token, User user) throws SimExplorerServiceException; /** * Gets the logged user. - * - * @param token - * the token - * + * + * @param token the token * @return the logged user - * - * @throws SimExplorerServiceException - * the sim explorer service exception + * @throws SimExplorerServiceException the sim explorer service exception */ public User getLoggedUser(String token) throws SimExplorerServiceException; /** * Gets the permissions. - * - * @param uuid - * the uuid - * + * + * @param uuid the uuid * @return the permissions */ public Permission[] getPermissions(String uuid); /** * Sets the permissions. - * - * @param uuid - * the uuid - * @param permissions - * the permissions + * + * @param uuid the uuid + * @param permissions the permissions */ public void setPermissions(String uuid, Permission[] permissions);

1 0

r931 - in trunk/simexplorer-is: simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services
by tchemit＠users.labs.libre-entreprise.org 13 Feb '08

13 Feb '08

Author: tchemit Date: 2008-02-13 16:43:46 +0000 (Wed, 13 Feb 2008) New Revision: 931 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java Log: introduction constante pour le looukp name Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-02-13 16:38:19 UTC (rev 930) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceHelper.java 2008-02-13 16:43:46 UTC (rev 931) @@ -24,6 +24,8 @@ public class StorageServiceHelper { + public static final String STORAGE_SERVICE_LOOKUP_NAME = "StorageService"; + /** * Export element to another service. * Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-13 16:38:19 UTC (rev 930) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-13 16:43:46 UTC (rev 931) @@ -26,6 +26,7 @@ import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; import fr.cemagref.simexplorer.is.service.StorageServiceClient; +import static fr.cemagref.simexplorer.is.service.StorageServiceHelper.STORAGE_SERVICE_LOOKUP_NAME; import javax.naming.Context; import javax.naming.InitialContext; @@ -206,7 +207,7 @@ } catch (Exception e) { context2 = new InitialContext(); } - remoteStorageService = (StorageService) context2.lookup("StorageService"); + remoteStorageService = (StorageService) context2.lookup(STORAGE_SERVICE_LOOKUP_NAME); } catch (NamingException e) { // no remote service available remoteStorageService = null; Modified: trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java 2008-02-13 16:38:19 UTC (rev 930) +++ trunk/simexplorer-is/simexplorer-is-web/src/java/fr/cemagref/simexplorer/is/ui/web/services/RemoteStorageService.java 2008-02-13 16:43:46 UTC (rev 931) @@ -18,6 +18,7 @@ package fr.cemagref.simexplorer.is.ui.web.services; import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.service.StorageServiceHelper; /** * The Class RemoteStorageService. @@ -30,6 +31,6 @@ * @return the storage service */ public static StorageService getStorageService() { - return (StorageService) getService("StorageService"); + return (StorageService) getService(StorageServiceHelper.STORAGE_SERVICE_LOOKUP_NAME); } }

1 0

r930 - 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 16:38:19 +0000 (Wed, 13 Feb 2008) New Revision: 930 Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java Log: champs statique ? Modified: trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-13 16:37:36 UTC (rev 929) +++ trunk/simexplorer-is/simexplorer-is-service/src/java/fr/cemagref/simexplorer/is/service/StorageServiceClient.java 2008-02-13 16:38:19 UTC (rev 930) @@ -19,10 +19,6 @@ import static org.codelutin.i18n.I18n._; -import java.io.InputStream; - -import fr.cemagref.simexplorer.is.attachment.Attachment; -import fr.cemagref.simexplorer.is.entities.metadata.MetaData; import fr.cemagref.simexplorer.is.entities.metadata.Version; import fr.cemagref.simexplorer.is.storage.SimExplorerStorageException; import fr.cemagref.simexplorer.is.storage.engine.StorageEngine; @@ -34,7 +30,7 @@ public class StorageServiceClient extends StorageServiceCommon { /** The storage engine. */ - private static StorageEngine storageEngine; + private StorageEngine storageEngine; /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.service.StorageService#loginUser(java.lang.String, java.lang.String)

1 0

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

13 Feb '08

Author: tchemit Date: 2008-02-13 16:37:36 +0000 (Wed, 13 Feb 2008) New Revision: 929 Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java Log: exemple de mise en place configuration dynamique (pouvoir specifier explicitement le parametrage) utilisation de File.separator fermeture de stream redundant initializer TODO en faire de meme sur les autres objets requierant une configuration (LuceneDatabase,Services,...) Modified: trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-13 16:25:50 UTC (rev 928) +++ trunk/simexplorer-is/simexplorer-is-storage/src/java/fr/cemagref/simexplorer/is/storage/attachment/FileSystemAttachmentHandler.java 2008-02-13 16:37:36 UTC (rev 929) @@ -25,6 +25,7 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; +import java.io.OutputStream; import org.codelutin.util.MD5; @@ -41,10 +42,28 @@ public class FileSystemAttachmentHandler extends AttachmentHandler { /** Base folder. */ - private static String baseFolder = Config.getProperties().getProperty( - "simexplorer.data"); + protected String baseFolder; /** + * Constructeur utilisant la configuration par defaut. + * <p/> + * TODO on devrait supprimer ce constructeur, car on doit maitriser la + * configuration. + */ + public FileSystemAttachmentHandler() { + baseFolder = Config.getProperties().getProperty("simexplorer.data"); + } + + /** + * Constructeur utilisant une configuration spécifique + * + * @param baseFolder le répertoire de base + */ + public FileSystemAttachmentHandler(String baseFolder) { + this.baseFolder = baseFolder; + } + + /** * Retrieve file associated to content Create directories associated to * file. * @@ -59,14 +78,15 @@ String resultPath = baseFolder; // Create file path + String separator = File.separator; if (entity.getUuid().length() > 3) { - resultPath = resultPath + entity.getUuid().substring(0, 1) + "/" - + entity.getUuid().substring(1, 2) + "/" - + entity.getUuid().substring(2, 3) + "/" + entity.getUuid(); + resultPath = resultPath + entity.getUuid().substring(0, 1) + separator + + entity.getUuid().substring(1, 2) + separator + + entity.getUuid().substring(2, 3) + separator + entity.getUuid(); } else { resultPath = resultPath + entity.getUuid(); } - resultPath = resultPath + "/" + entity.getVersion().toString() + "/" + resultPath = resultPath + separator + entity.getVersion().toString() + separator + attachment.getUniqueId(); File result = new File(resultPath); @@ -86,7 +106,7 @@ public InputStream retrieveData(MetaData entity, Attachment attachment) throws SimExplorerStorageException { // Simple stream on file - FileInputStream fis = null; + FileInputStream fis; try { fis = new FileInputStream(getFile(entity, attachment)); } catch (FileNotFoundException e) { @@ -101,7 +121,7 @@ @Override public String retrieveMD5Data(MetaData entity, Attachment attachment) throws SimExplorerStorageException { - String md5 = null; + String md5; try { md5 = MD5.asHex(MD5.getHash(getFile(entity, attachment))); } catch (Exception e) { @@ -117,14 +137,16 @@ public void storeData(MetaData entity, Attachment attachment, InputStream is) throws SimExplorerStorageException { + BufferedOutputStream bout = null; // Simple stream on file try { + File file = getFile(entity, attachment); FileOutputStream fos = new FileOutputStream(file); // Buffer copy stream to stream BufferedInputStream bin = new BufferedInputStream(is); - BufferedOutputStream bout = new BufferedOutputStream(fos); + bout = new BufferedOutputStream(fos); while (true) { int datum = bin.read(); @@ -132,17 +154,29 @@ break; bout.write(datum); } + bout.flush(); - // Close file - fos.close(); } catch (FileNotFoundException e) { throw new SimExplorerStorageException(e); } catch (IOException e) { throw new SimExplorerStorageException(e); + } finally { + closeStream(bout); } } + protected void closeStream(OutputStream fos) throws SimExplorerStorageException { + if (fos != null) { + // Close file + try { + fos.close(); + } catch (IOException e) { + throw new SimExplorerStorageException(e); + } + } + } + /* (non-Javadoc) * @see fr.cemagref.simexplorer.is.storage.attachment.AttachmentHandler#deleteData(fr.cemagref.simexplorer.is.entities.metadata.MetaData, java.lang.String) */

1 0

r928 - in 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 16:25:50 +0000 (Wed, 13 Feb 2008) New Revision: 928 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java Log: suppression des storage services du contexte de l'application : tout se passe dans StorageServiceHelper Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-02-13 16:09:09 UTC (rev 927) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/SimExplorerContext.java 2008-02-13 16:25:50 UTC (rev 928) @@ -18,8 +18,6 @@ * ##% */ 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.actions.SimExplorerCommonActions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -62,12 +60,6 @@ /** le token pour la connexion au serveur distant */ protected String token; - /** le service de données distant */ - protected StorageService remoteStorageService; - - /** le service de données local */ - protected StorageService storageService; - /** * @return le parseur utilisé pour parser les options de la ligne de * commande. @@ -161,28 +153,6 @@ 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; - } - - public StorageService getStorageService(boolean remote) { - StorageService service; - service = remote ? getRemoteStorageService() : getLocalStorageService(); - return service; - } - public void setQuit(boolean quit) { this.quit = quit; } Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-13 16:09:09 UTC (rev 927) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-13 16:25:50 UTC (rev 928) @@ -25,6 +25,7 @@ import fr.cemagref.simexplorer.is.service.MockStorageServiceImpl; import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; +import fr.cemagref.simexplorer.is.service.StorageServiceClient; import javax.naming.Context; import javax.naming.InitialContext; @@ -41,6 +42,8 @@ */ public class StorageServiceHelper { + private final static boolean mock = true; + private final static String PROVIDER_URL = "java.naming.provider.url"; private final static String FACTORY_INITIAL = "java.naming.factory.initial"; private final static String FACTORY_URL_PKGS = "java.naming.factory.url.pkgs"; @@ -58,7 +61,7 @@ */ public static StorageService getService(SimExplorerContext context, boolean remote) { StorageService service; - service = remote ? getRemoteStorageService(context) : getLocalStorageService(context); + service = remote ? getRemoteStorageService(context) : getLocalStorageService(); return service; } @@ -171,13 +174,17 @@ } } - /** - * @param context le context de l'application - * @return le service de storage locale - */ - protected static StorageService getLocalStorageService(SimExplorerContext context) { + /** @return le service de storage locale */ + protected static StorageService getLocalStorageService() { if (storageService == null) { - storageService = initLocalStorageService(context.getConfig()); + if (mock) { + return storageService = new MockStorageServiceImpl(); + } + try { + storageService = new StorageServiceClient(); + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); + } } return storageService; } @@ -188,51 +195,24 @@ */ protected static StorageService getRemoteStorageService(SimExplorerContext context) { if (remoteStorageService == null) { - remoteStorageService = initRemoteStorageService(context.getConfig()); - } - return remoteStorageService; - } - - /** - * Initialise le service local de Storage - * - * @param config la config de l'application - * @return le service local initialisé - * @throws SimExplorerRuntimeException si pb lors de l'init du service - */ - protected static StorageService initLocalStorageService(SimExplorerConfig config) throws SimExplorerRuntimeException { - StorageService service; - try { - service = new MockStorageServiceImpl(); - return service; - } catch (Exception e) { - throw new SimExplorerRuntimeException(e); - } - } - - /** - * Initialise le service distant de Storage - * - * @param config la config de l'application - * @return le service distant initialisé - * @throws SimExplorerRuntimeException si pb lors de l'init du service - */ - protected static StorageService initRemoteStorageService(SimExplorerConfig config) throws SimExplorerRuntimeException { - - try { - StorageService service; - Properties props = initProperties(config.getRemoteURI()); - Context context; + if (mock) { + return remoteStorageService = new MockStorageServiceImpl(); + } try { - context = new InitialContext(props); - } catch (Exception e) { - context = new InitialContext(); + Properties props = initProperties(context.getConfig().getRemoteURI()); + Context context2; + try { + context2 = new InitialContext(props); + } catch (Exception e) { + context2 = new InitialContext(); + } + remoteStorageService = (StorageService) context2.lookup("StorageService"); + } catch (NamingException e) { + // no remote service available + remoteStorageService = null; } - service = (StorageService) context.lookup("StorageService"); - return service; - } catch (NamingException e) { - throw new SimExplorerRuntimeException(e); } + return remoteStorageService; } protected static Properties initProperties(URI uri) { 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 16:09:09 UTC (rev 927) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/actions/ConnectAction.java 2008-02-13 16:25:50 UTC (rev 928) @@ -22,6 +22,7 @@ import fr.cemagref.simexplorer.is.service.StorageService; 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 java.awt.event.ActionEvent; @@ -70,7 +71,7 @@ @Override protected void doAction(ActionEvent e) throws Exception { super.doAction(e); - StorageService service = getContext().getRemoteStorageService(); + StorageService service = StorageServiceHelper.getService(getContext(),true); try { String token = service.loginUser(login, password);

1 0

r927 - 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 16:09:09 +0000 (Wed, 13 Feb 2008) New Revision: 927 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties Log: suppression option non utilise Modified: trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-13 15:27:24 UTC (rev 926) +++ trunk/simexplorer-is/simexplorer-is-swing/src/resources/commandline.properties 2008-02-13 16:09:09 UTC (rev 927) @@ -51,9 +51,6 @@ main.config.definition.showRemoteTab=java.lang.Boolean:False main.config.modifiers.showRemoteTab= -#main.config.definition.showSynchTab=java.lang.Boolean:False -#main.config.modifiers.showSynchTab= - main.config.definition.autoConnect=java.lang.Boolean:False main.config.modifiers.autoConnect=

1 0

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

13 Feb '08

Author: tchemit Date: 2008-02-13 15:27:24 +0000 (Wed, 13 Feb 2008) New Revision: 926 Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java Log: initialisation des services Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-13 15:24:47 UTC (rev 925) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/StorageServiceHelper.java 2008-02-13 15:27:24 UTC (rev 926) @@ -26,16 +26,42 @@ import fr.cemagref.simexplorer.is.service.SimExplorerServiceException; import fr.cemagref.simexplorer.is.service.StorageService; +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NamingException; import java.io.BufferedInputStream; import java.io.InputStream; +import java.net.URI; +import java.util.Properties; /** - * Une classe pour encapsuler les appels aux services Storage + * Une classe pour encapsuler les appels aux services Storage et leur initialisation. * * @author chemit */ public class StorageServiceHelper { + private final static String PROVIDER_URL = "java.naming.provider.url"; + private final static String FACTORY_INITIAL = "java.naming.factory.initial"; + private final static String FACTORY_URL_PKGS = "java.naming.factory.url.pkgs"; + + /** le service de données distant */ + protected static StorageService remoteStorageService; + + /** le service de données local */ + protected static StorageService storageService; + + /** + * @param context le context de l'application + * @param remote flag pour indiquer le type de service recherché (local ou remote) + * @return le service instancié et initialisé + */ + public static StorageService getService(SimExplorerContext context, boolean remote) { + StorageService service; + service = remote ? getRemoteStorageService(context) : getLocalStorageService(context); + return service; + } + public static int getCount(SimExplorerContext context, boolean remote, String query, boolean onlyLatest) { StorageService service = getService(context, remote); String token = context.getToken(); @@ -145,9 +171,79 @@ } } - protected static StorageService getService(SimExplorerContext context, boolean remote) { + /** + * @param context le context de l'application + * @return le service de storage locale + */ + protected static StorageService getLocalStorageService(SimExplorerContext context) { + if (storageService == null) { + storageService = initLocalStorageService(context.getConfig()); + } + return storageService; + } + + /** + * @param context le context de l'application + * @return le service de storage distant + */ + protected static StorageService getRemoteStorageService(SimExplorerContext context) { + if (remoteStorageService == null) { + remoteStorageService = initRemoteStorageService(context.getConfig()); + } + return remoteStorageService; + } + + /** + * Initialise le service local de Storage + * + * @param config la config de l'application + * @return le service local initialisé + * @throws SimExplorerRuntimeException si pb lors de l'init du service + */ + protected static StorageService initLocalStorageService(SimExplorerConfig config) throws SimExplorerRuntimeException { StorageService service; - service = context.getStorageService(remote); - return service; + try { + service = new MockStorageServiceImpl(); + return service; + } catch (Exception e) { + throw new SimExplorerRuntimeException(e); + } } + + /** + * Initialise le service distant de Storage + * + * @param config la config de l'application + * @return le service distant initialisé + * @throws SimExplorerRuntimeException si pb lors de l'init du service + */ + protected static StorageService initRemoteStorageService(SimExplorerConfig config) throws SimExplorerRuntimeException { + + try { + StorageService service; + Properties props = initProperties(config.getRemoteURI()); + Context context; + try { + context = new InitialContext(props); + } catch (Exception e) { + context = new InitialContext(); + } + service = (StorageService) context.lookup("StorageService"); + return service; + } catch (NamingException e) { + throw new SimExplorerRuntimeException(e); + } + } + + protected static Properties initProperties(URI uri) { + Properties props = (Properties) System.getProperties().clone(); + props.put(PROVIDER_URL, uri.toString()); + props.put(FACTORY_INITIAL, "org.jnp.interfaces.NamingContextFactory"); + props.put(FACTORY_URL_PKGS, "org.jnp.interfaces"); + return props; + } + + protected StorageServiceHelper() { + // no instance + } }

1 0