Author: mfortun Date: 2011-08-16 12:17:42 +0200 (Tue, 16 Aug 2011) New Revision: 1157 Url: http://nuiton.org/repositories/revision/wikitty/1157 Log: *add log error for exception instead of nothing Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -21,8 +21,7 @@ public class CodeDecorator { - static private Log log = LogFactory - .getLog(CodeDecorator.class); + static private Log log = LogFactory.getLog(CodeDecorator.class); /* * Après le script engine le ui Code décorateur Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -26,6 +26,8 @@ import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.ScriptEvaluator; @@ -47,6 +49,8 @@ */ public class MimeTypePubHelper { + static private Log log = LogFactory.getLog(MimeTypePubHelper.class); + public static final String JAVA_TYPE = "text/java"; /** * Mapping between extention and mime type, key: extension, value: mimeType @@ -91,8 +95,10 @@ mimeProps.load(input); } catch (IOException e) { - // TODO mfortun-2011-08-12 handle exception ? - e.printStackTrace(); + // TODO mfortun-2011-08-16 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while reading properties Fie that containt mimetype mapping ", e ); + } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -483,9 +483,11 @@ } } - } catch (Exception e) { - e.printStackTrace(); - // TODO mfortun-2011-04-12 really handle exceptions + } catch (IOException e) { + // TODO mfortun-2011-08-12 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while store wikitty on FS", e ); + } } return result; @@ -553,7 +555,7 @@ * restore file as wikitty */ public List<Wikitty> restore(String securityToken, List<String> id) { - + FileSystemWIkittyId localisation = null; List<Wikitty> result = new ArrayList<Wikitty>(); log.info("restore wikitty, number: " + id.size()); try { @@ -571,15 +573,18 @@ Object value = locations.get(wikid); if (value != null) { - FileSystemWIkittyId localisation = (FileSystemWIkittyId) value; + localisation = (FileSystemWIkittyId) value; result.add(restore(wikid, localisation)); } } - } catch (Exception e) { + } catch (IOException e) { e.printStackTrace(); - // TODO mfortun-2011-01-12 really handle exception + // TODO mfortun-2011-08-16 really handle exception + if (log.isErrorEnabled()){ + log.error("Error while restoring wikitty located:"+localisation, e ); + } } return result; @@ -641,9 +646,11 @@ } } - } catch (Exception e) { - e.printStackTrace(); - // TODO mfortun-2011-04-13 really handle exception + } catch (IOException e) { + // TODO mfortun-2011-08-16 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while deleting wikitty on FS", e ); + } } WikittyEvent result = new WikittyEvent(this); @@ -678,9 +685,11 @@ } - } catch (Exception e) { - // TODO mfortun-2011-04-20 really handle exception - e.printStackTrace(); + } catch (IOException e) { + // TODO mfortun-2011-08-16 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while search forAllWikitty on FS", e ); + } } return wikitties; } @@ -752,10 +761,10 @@ * @param starts * @param recursivly * @return - * @throws Exception + * @throws IOException */ - public BidiMap harvestLocalWikitties(File starts, boolean recursivly) - throws Exception { + public BidiMap harvestLocalWikitties(File starts, boolean recursivly) throws IOException + { BidiMap result = new DualHashBidiMap(); log.info("harvest localWikitty"); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -66,14 +66,10 @@ public String execute() throws Exception { - proxy = getWikittyPublicationProxy(); Map<String, Object> param = ActionContext.getContext().getParameters(); formatArgs(param); - - - isDelete = param.containsKey("delete"); isStore = param.containsKey("store"); @@ -321,8 +317,12 @@ FileUtil.fileToByte(uploadedFile)); uploadedFile.deleteOnExit(); } catch (IOException e) { - // TODO mfortun-2011-05-24 really handle exception - e.printStackTrace(); + // TODO mfortun-2011-08-16 Exception not really handled + if (log.isErrorEnabled()){ + log.error( + "Error while reading File uploaded as wikittyPubDataContent ", + e); + } } } else { wikittyFieldMap.put(en.getKey(), value); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -158,7 +158,7 @@ WikittyPubTextCompiledHelper .setByteCode(w, wikittyByte); } catch (Exception e) { - // TODO Mfortun-2011-08-16 really handle exception + // TODO mfortun-2011-08-16 really handle exception if (log.isErrorEnabled()){ log.error( "Error while transforming wikittyPubText to wikittyPubTextCompiled wikitty:" Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -28,7 +28,6 @@ import com.opensymphony.xwork2.ActionContext; - /** * Class used as an action login, call the login method on the proxy with * login/password pass threw the login form @@ -44,12 +43,10 @@ protected String error; protected String success; - static public PublicationActionLogin getAction() { return (PublicationActionLogin) ActionContext.getContext().get( CONTEXT_ACTION_KEY); } - public String getLogin() { return login; @@ -96,15 +93,10 @@ if (password != null) { String md5 = StringUtil.encodeMD5(password); - try { + getWikittyPublicationSession().login(getContextArgs(), login, + md5); + result = SUCCESS; - getWikittyPublicationSession().login(getContextArgs(),login, md5); - result = SUCCESS; - - } catch (Exception e) { - // TODO mfortun-2011-05-12 handle exception due to wrong - e.printStackTrace(); - } } } Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -50,25 +50,18 @@ Wikitty w = proxy.findByCriteria(criteria); - try { + if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + mimeType = WikittyPubDataHelper.getMimeType(w); + inputStream = new ByteArrayInputStream( + WikittyPubDataHelper.getContent(w)); - if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { - mimeType = WikittyPubDataHelper.getMimeType(w); - inputStream = new ByteArrayInputStream( - WikittyPubDataHelper.getContent(w)); + } else if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + mimeType = WikittyPubTextHelper.getMimeType(w); + inputStream = new ByteArrayInputStream(WikittyPubTextHelper + .getContent(w).getBytes()); + } - } else if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { - mimeType = WikittyPubTextHelper.getMimeType(w); - inputStream = new ByteArrayInputStream(WikittyPubTextHelper - .getContent(w).getBytes()); - } - } catch (Exception e) { - // TODO mfortun-2011-05-09 really handle exception - e.printStackTrace(); - - } - return SUCCESS; } Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java 2011-08-16 09:50:46 UTC (rev 1156) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRegister.java 2011-08-16 10:17:42 UTC (rev 1157) @@ -69,48 +69,45 @@ public String execute() { String result = INPUT; - try { - if (login != null) { - login = login.trim(); - if (password != null) { - if (!password.equals(repeatPassword)) { - // TODO mfortun-2011-05-13 handle error message in jsp - } else { - String md5 = StringUtil.encodeMD5(password); - // If the email address isn't already used - if (!alreadyRegistered()) { - WikittyProxy proxy = getWikittyPublicationProxy(); + if (login != null) { + login = login.trim(); + if (password != null) { + if (!password.equals(repeatPassword)) { + // TODO mfortun-2011-05-13 handle error message in jsp + } else { + String md5 = StringUtil.encodeMD5(password); - WikittyUser user = new WikittyUserImpl(); - user.setLogin(login); - user.setPassword(md5); + // If the email address isn't already used + if (!alreadyRegistered()) { + WikittyProxy proxy = getWikittyPublicationProxy(); - WikittyUser userLoged = proxy.store(user); - // check if wikitty still exist - if (userLoged == null) { - // TODO mfortun-2011-05-13 handle error message - // in jsp - } else { - // try to login with information - proxy.login(login, md5); - // if logged it works - if (proxy.getLoggedInUser() != null) { + WikittyUser user = new WikittyUserImpl(); + user.setLogin(login); + user.setPassword(md5); - getWikittyPublicationSession().setUser( - proxy.getLoggedInUser()); + WikittyUser userLoged = proxy.store(user); + // check if wikitty still exist + if (userLoged == null) { + // TODO mfortun-2011-05-13 handle error message + // in jsp + } else { + // try to login with information + proxy.login(login, md5); + // if logged it works + if (proxy.getLoggedInUser() != null) { - result = SUCCESS; - } + getWikittyPublicationSession().setUser( + proxy.getLoggedInUser()); + + result = SUCCESS; } } } } } - } catch (Exception e) { - // TODO mfortun-2011-05-13 really handle exception - e.printStackTrace(); } + return result; }