Author: mfortun Date: 2011-08-12 14:54:07 +0200 (Fri, 12 Aug 2011) New Revision: 1131 Url: http://nuiton.org/repositories/revision/wikitty/1131 Log: *change exception handling Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/site/rst/wp-application.rst Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-12 12:54:07 UTC (rev 1131) @@ -10,6 +10,9 @@ import java.util.Properties; import java.util.jar.JarEntry; import java.util.jar.JarFile; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.entities.Wikitty; @@ -46,6 +49,9 @@ public static String JAR_LOCATION_KEY = "wikitty.publication.repository.jar"; + /** Class logger. */ + private static Log log = LogFactory.getLog(WikittyServiceJarLoader.class); + protected JarFile wikittyJarRepository; protected Properties wikittyIndex; @@ -98,8 +104,10 @@ mimeHelper = new MimeTypePubHelper(); } catch (IOException e) { - // TODO mfortun-2011-07-11 realy handle exception - e.printStackTrace(); + // TODO mfortun-2011-08-12 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while reading jar:"+wikittyJarRepository.getName(), e ); + } } } @@ -334,44 +342,42 @@ protected Wikitty restore(String wikittyId) { Wikitty wikit = null; - try { - if (!exists(wikittyId)) { - return null; - } - - String mime = wikittyMetadata.getProperty(wikittyId - + WikittyPublicationExternalize.MIME_SUFFIX); - String fileExtension = mimeHelper.getExtensionForMime(mime); - String path = wikittyIndex.getProperty(wikittyId); - String version = wikittyMetadata.getProperty(wikittyId - + WikittyPublicationExternalize.VERSION_SUFFIX); - JarEntry wikittyJared = wikittyJarRepository.getJarEntry(path + "." - + fileExtension); + if (!exists(wikittyId)) { + return null; + } - + String mime = wikittyMetadata.getProperty(wikittyId + + WikittyPublicationExternalize.MIME_SUFFIX); + String fileExtension = mimeHelper.getExtensionForMime(mime); + String path = wikittyIndex.getProperty(wikittyId); + String version = wikittyMetadata.getProperty(wikittyId + + WikittyPublicationExternalize.VERSION_SUFFIX); - wikit = new WikittyImpl(wikittyId); - wikit.setVersion(version); + JarEntry wikittyJared = wikittyJarRepository.getJarEntry(path + "." + + fileExtension); - wikit.addExtension(WikittyLabelImpl.extensionWikittyLabel); + wikit = new WikittyImpl(wikittyId); + wikit.setVersion(version); - // set labels computate name - String sep = wikittyMetadata - .getProperty(WikittyPublicationExternalize.PATH_SEPARATOR_PROPERTIE_KEY); - String[] namPath = StringUtil.split(path, sep); - String wikittyName = namPath[namPath.length - 1]; + wikit.addExtension(WikittyLabelImpl.extensionWikittyLabel); - String label = ""; - for (int i = 0; i < namPath.length - 1; i++) { - label += namPath[i]; - if (i < namPath.length - 2) { - label += WikittyPublicationFileSystem.WIKITTYLABEL_SEPARATOR; - } + // set labels computate name + String sep = wikittyMetadata + .getProperty(WikittyPublicationExternalize.PATH_SEPARATOR_PROPERTIE_KEY); + String[] namPath = StringUtil.split(path, sep); + String wikittyName = namPath[namPath.length - 1]; + + String label = ""; + for (int i = 0; i < namPath.length - 1; i++) { + label += namPath[i]; + if (i < namPath.length - 2) { + label += WikittyPublicationFileSystem.WIKITTYLABEL_SEPARATOR; } + } - WikittyLabelHelper.addLabels(wikit, label); - + WikittyLabelHelper.addLabels(wikit, label); + try { if (mimeHelper.isPubTextMime(mime)) { // wikitty pub text compiled wikit.addExtension(WikittyPubTextImpl.extensions); @@ -393,18 +399,20 @@ } else { // wikitty pub data wikit.addExtension(WikittyPubDataImpl.extensionWikittyPubData); - WikittyPubDataHelper.setMimeType(wikit,mime); + WikittyPubDataHelper.setMimeType(wikit, mime); WikittyPubDataHelper.setName(wikit, wikittyName); WikittyPubDataHelper.setContent(wikit, JarUtil.getByteContent( wikittyJarRepository, wikittyJared)); } - - } catch (Exception e) { - // TODO mfortun-2011-07-11 really handle exception - e.printStackTrace(); + } catch (IOException e) { + // TODO mfortun-2011-08-12 Exception not really handled + if (log.isErrorEnabled()){ + log.error("Error while reading jar:"+wikittyJarRepository.getName(), e ); + } } + return wikit; } Modified: trunk/wikitty-publication/src/site/rst/wp-application.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/wp-application.rst 2011-08-12 12:16:04 UTC (rev 1130) +++ trunk/wikitty-publication/src/site/rst/wp-application.rst 2011-08-12 12:54:07 UTC (rev 1131) @@ -2,6 +2,10 @@ =============================== :Authors: Manoël Fortun +But +*** + + Specifications diverse sur l'utilisation de wikitty publication