Author: fdesbois Date: 2010-04-08 10:34:27 +0000 (Thu, 08 Apr 2010) New Revision: 434 Added: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java Removed: trunk/wao-business/src/main/java/fr/ifremer/wao/MD5.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java Log: - Don't generate WaoContext - Use StringUtil.encodeMD5 instead of MD5 class, now deleted - Use only one interface for context (no more WaoContextImplementor) Deleted: trunk/wao-business/src/main/java/fr/ifremer/wao/MD5.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/MD5.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/MD5.java 2010-04-08 10:34:27 UTC (rev 434) @@ -1,64 +0,0 @@ -/* *##% - * Wao :: Business - * Copyright (C) 2009 - 2010 Ifremer - * - * 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 3 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * ##%*/ - -package fr.ifremer.wao; - -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -/** - * Classe utilitaire permettant d'encoder des chaîne en MD5. - * - * @version $Id$ - */ -public class MD5 { - - /** - * Encode la chaine passé en paramètre avec l’algorithme MD5 - * - * @param key : la chaine à encoder - * @return la valeur (string) hexadécimale sur 32 bits - */ - public static String encode(String key) { - if (key == null) { - return key; - } - byte[] uniqueKey = key.getBytes(); - byte[] hash = null; - - try { - // on récupère un objet qui permettra de crypter la chaine - hash = MessageDigest.getInstance("MD5").digest(uniqueKey); - } catch (NoSuchAlgorithmException eee) { - throw new RuntimeException("no MD5 support in this VM", eee); - } - - StringBuffer hashString = new StringBuffer(); - for (int i = 0; i < hash.length; ++i) { - String hex = Integer.toHexString(hash[i]); - if (hex.length() == 1) { - hashString.append("0"); - hashString.append(hex.charAt(hex.length() - 1)); - } else { - hashString.append(hex.substring(hex.length() - 2)); - } - } - return hashString.toString(); - } -} Added: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java (rev 0) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java 2010-04-08 10:34:27 UTC (rev 434) @@ -0,0 +1,142 @@ +package fr.ifremer.wao; + +import fr.ifremer.wao.service.ServiceUser; +import java.nio.charset.Charset; +import java.util.Date; +import org.apache.commons.mail.EmailException; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.ApplicationConfig; + + +public interface WaoContext { + + /** + * getProperty : + * @param property + * @return String + */ + public String getProperty(WaoProperty property); + + /** + * isActivityCalendarImportRun : + * @return boolean + */ + public boolean isActivityCalendarImportRun(); + + /** + * getConfiguration : + * @return ApplicationConfig + */ + public ApplicationConfig getConfiguration(); + + /** + * start : + * @param serviceUser + */ + public void start(ServiceUser serviceUser); + + /** + * stop : + */ + public void stop(); + + /** + * setActivityCalendarImportRun : + * @param run + */ + public void setActivityCalendarImportRun(boolean run); + + /** + * createRandomString : + * @param length + * @return String + */ + public String createRandomString(int length); + + /** + * encodeString : + * @param str + * @return String + */ + public String encodeString(String str); + + /** + * convertId : + * @param topiaId + * @return String + */ + public String convertId(String topiaId); + + /** + * getCsvCharset : + * @return Charset + */ + public Charset getCsvCharset(); + + /** + * prepareSampleRowCode : + * @param code + * @return String + */ + public String prepareSampleRowCode(String code); + + /** + * prepareTopiaId : + * @param <E> + * @param entityClass + * @param entity + * @return boolean + */ + public <E extends TopiaEntity> boolean prepareTopiaId(Class<E> entityClass, E entity); + + /** + * sendEmail : + * @param to + * @param subject + * @param msg + * @throws EmailException + */ + public void sendEmail(String to, String subject, String msg) throws EmailException; + + /** + * getCurrentDate : + * @return Date + */ + public Date getCurrentDate(); + + /** + * beginTransaction : + * @return TopiaContext + * @throws TopiaException + */ + public TopiaContext beginTransaction() throws TopiaException; + + /** + * treateError : + * @param eee + * @param message + * @param args + * @throws WaoException + */ + public void treateError(Exception eee, String message, Object... args) throws WaoException; + + /** + * treateError : + * @param transaction + * @param eee + * @param message + * @param args + * @throws WaoException + */ + public void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws WaoException; + + /** + * closeTransaction : + * @param transaction + */ + public void closeTransaction(TopiaContext transaction); + + +} //WaoContext Property changes on: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContext.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoContextImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -25,8 +25,10 @@ import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.service.ServiceUser; import java.nio.charset.Charset; +import java.security.NoSuchAlgorithmException; import java.util.Date; import java.util.Locale; +import java.util.logging.Level; import org.apache.commons.lang.RandomStringUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.mail.EmailException; @@ -43,6 +45,7 @@ import org.nuiton.topia.persistence.TopiaId; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static org.nuiton.i18n.I18n.n_; @@ -59,7 +62,7 @@ * Last update: $Date$ * by : $Author: fdesbois $ */ -public class WaoContextImpl implements WaoContextImplementor { +public class WaoContextImpl implements WaoContext { private static final Logger log = LoggerFactory.getLogger(WaoContextImpl.class); @@ -365,7 +368,12 @@ @Override public String encodeString(String string) { - return MD5.encode(string); + try { + return StringUtil.encodeMD5(string); + } catch (NoSuchAlgorithmException eee) { + treateError(eee, n_("wao.error.context.encodeString")); + } + return null; } @Override Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoUtils.java 2010-04-08 10:34:27 UTC (rev 434) @@ -50,11 +50,11 @@ private static final Logger logger = LoggerFactory.getLogger(WaoUtils.class); - private static WaoContextImplementor context; + private static WaoContext context; private static org.apache.log4j.Logger activityCalendarAccessLogger; - static void setContext(WaoContextImplementor context) { + static void setContext(WaoContext context) { WaoUtils.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/ImportHelper.java 2010-04-08 10:34:27 UTC (rev 434) @@ -60,7 +60,7 @@ protected CsvReader reader; - protected static WaoContextImplementor context; + protected static WaoContext context; // 2000 -> 2099 public static final int CURRENT_MILLENIUM = 2000; @@ -72,7 +72,7 @@ this.reader = reader; } - public static void setContext(WaoContextImplementor context) { + public static void setContext(WaoContext context) { ImportHelper.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ActivityCalendarImport.java 2010-04-08 10:34:27 UTC (rev 434) @@ -69,7 +69,7 @@ */ public class ActivityCalendarImport implements Runnable { - private WaoContextImplementor context; + private WaoContext context; private InputStream input; @@ -121,7 +121,7 @@ } } - public ActivityCalendarImport(WaoContextImplementor context, + public ActivityCalendarImport(WaoContext context, InputStream input) throws IOException { super(); this.context = context; Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceBoatImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -25,7 +25,7 @@ import com.csvreader.CsvWriter; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; @@ -75,9 +75,9 @@ private static final Logger log = LoggerFactory.getLogger(ServiceBoatImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceContactImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -28,7 +28,7 @@ import fr.ifremer.wao.io.ImportHelper.*; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.bean.ContactState; import java.io.IOException; @@ -91,9 +91,9 @@ private static final Logger log = LoggerFactory.getLogger(ServiceContactImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceNewsImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -21,7 +21,7 @@ package fr.ifremer.wao.service; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.entity.News; @@ -49,9 +49,9 @@ private static final Logger logger = LoggerFactory.getLogger(ServiceNewsImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceReferentialImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -22,7 +22,7 @@ package fr.ifremer.wao.service; import com.csvreader.CsvReader; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.SamplingFilter; @@ -61,9 +61,9 @@ private static final Logger log = LoggerFactory.getLogger(ServiceReferentialImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -26,7 +26,7 @@ import fr.ifremer.wao.io.ImportHelper; import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.FacadeRow; @@ -83,9 +83,9 @@ private static final Logger log = LoggerFactory.getLogger(ServiceSamplingImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSynthesisImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -21,7 +21,7 @@ package fr.ifremer.wao.service; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.bean.ContactAverageReactivityImpl; @@ -77,9 +77,9 @@ private static final Logger log = LoggerFactory.getLogger(ServiceSynthesisImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceUserImpl.java 2010-04-08 10:34:27 UTC (rev 434) @@ -23,7 +23,7 @@ import fr.ifremer.wao.WaoBusinessException; import fr.ifremer.wao.WaoBusinessException.Type; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoDAOHelper; import fr.ifremer.wao.WaoException; import fr.ifremer.wao.WaoProperty; @@ -63,9 +63,9 @@ private static final Logger log = LoggerFactory.getLogger(ServiceUserImpl.class); - private WaoContextImplementor context; + private WaoContext context; - public void setContext(WaoContextImplementor context) { + public void setContext(WaoContext context) { this.context = context; } Modified: trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/resources/i18n/wao-business-en_GB.properties 2010-04-08 10:34:27 UTC (rev 434) @@ -2,6 +2,7 @@ wao.error.boat.getNbBoarding= wao.error.boatInfos.getNbBoardingForCompany= wao.error.context.close= +wao.error.context.encodeString= wao.error.context.getRootContext= wao.error.context.parse= wao.error.context.rollback= Modified: trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties =================================================================== --- trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/main/resources/i18n/wao-business-fr_FR.properties 2010-04-08 10:34:27 UTC (rev 434) @@ -2,6 +2,7 @@ wao.error.boat.getNbBoarding=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s wao.error.boatInfos.getNbBoardingForCompany=Impossible de r\u00E9cup\u00E9rer le nombre d'embarquements r\u00E9els depuis le %1$s pour la soci\u00E9t\u00E9 %2$s wao.error.context.close=Une erreur est survenue pendant la fermeture du contexte principale de ToPIA +wao.error.context.encodeString= wao.error.context.getRootContext=Une erreur est survenue pour la r\u00E9cup\u00E9ration du contexte principale de ToPIA wao.error.context.parse=Une erreur est survenue pendant le chargement de la configuration du fichier %1$s wao.error.context.rollback=Une erreur est survenue pendant l'annulation de la transaction courante Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java =================================================================== --- trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-business/src/test/java/fr/ifremer/wao/TestManager.java 2010-04-08 10:34:27 UTC (rev 434) @@ -103,7 +103,7 @@ } } - public WaoContextImplementor getContext() { + public WaoContext getContext() { return context; } Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-04-08 10:16:35 UTC (rev 433) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/WaoManager.java 2010-04-08 10:34:27 UTC (rev 434) @@ -21,7 +21,7 @@ package fr.ifremer.wao.ui.services; -import fr.ifremer.wao.WaoContextImplementor; +import fr.ifremer.wao.WaoContext; import fr.ifremer.wao.WaoProperty; import fr.ifremer.wao.service.ServiceUser; import java.util.Date; @@ -46,7 +46,7 @@ private static final Logger log = LoggerFactory.getLogger(WaoManager.class); - private WaoContextImplementor context; + private WaoContext context; private ServiceUser serviceUser; @@ -55,7 +55,7 @@ * * @param context used to manage application lifecycle */ - public WaoManager(WaoContextImplementor context) { + public WaoManager(WaoContext context) { this.context = context; } @@ -90,7 +90,7 @@ * * @return the WaoContext of the application */ - WaoContextImplementor getContext() { + WaoContext getContext() { return context; }