Author: mfortun Date: 2011-08-29 17:02:04 +0200 (Mon, 29 Aug 2011) New Revision: 1198 Url: http://nuiton.org/repositories/revision/wikitty/1198 Log: *doc *add logging *correct example ressource -> resource* Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.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-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -70,26 +70,26 @@ defaultFilterOption = new FilterOption(); defaultFilterOption.setOpeningTemplate(mimeProps - .getProperty(FilterOption.OpeningTemplate)); + .getProperty(FilterOption.OPENING_TEMPLATE)); defaultFilterOption.setWriteString(mimeProps - .getProperty(FilterOption.WriteString)); + .getProperty(FilterOption.WRITE_STRING)); defaultFilterOption.setStringDelim(mimeProps - .getProperty(FilterOption.StringDelim)); + .getProperty(FilterOption.STRING_DELIM)); defaultFilterOption.setConcatChar(mimeProps - .getProperty(FilterOption.ConcatChar)); + .getProperty(FilterOption.CONCAT_CHAR)); defaultFilterOption.setEndingCar(mimeProps - .getProperty(FilterOption.EndingCar)); + .getProperty(FilterOption.ENDING_CAR)); defaultFilterOption.setClosingWriterChar(mimeProps - .getProperty(FilterOption.ClosingWriterChar)); + .getProperty(FilterOption.CLOSING_WRITER_CHAR)); defaultFilterOption.setOpeningWriterChar(mimeProps - .getProperty(FilterOption.OpeningWriterChar)); + .getProperty(FilterOption.OPENING_WRITER_CHAR)); defaultFilterOption.setClosingTemplate(mimeProps - .getProperty(FilterOption.ClosingTemplate)); + .getProperty(FilterOption.CLOSING_TEMPLATE)); defaultFilterOption.setMimeType(mimeProps - .getProperty(FilterOption.MimeType)); - defaultFilterOption.setKey(mimeProps.getProperty(FilterOption.Key)); + .getProperty(FilterOption.MIME_TYPE)); + defaultFilterOption.setKey(mimeProps.getProperty(FilterOption.KEY)); defaultFilterOption.setContentType(mimeProps - .getProperty(FilterOption.ContentType)); + .getProperty(FilterOption.CONTENT_TYPE)); } @@ -112,23 +112,23 @@ // parse properties FilterOption option = new FilterOption(); option.setOpeningTemplate(props - .getProperty(FilterOption.OpeningTemplate)); + .getProperty(FilterOption.OPENING_TEMPLATE)); option.setWriteString(props - .getProperty(FilterOption.WriteString)); + .getProperty(FilterOption.WRITE_STRING)); option.setStringDelim(props - .getProperty(FilterOption.StringDelim)); - option.setConcatChar(props.getProperty(FilterOption.ConcatChar)); - option.setEndingCar(props.getProperty(FilterOption.EndingCar)); + .getProperty(FilterOption.STRING_DELIM)); + option.setConcatChar(props.getProperty(FilterOption.CONCAT_CHAR)); + option.setEndingCar(props.getProperty(FilterOption.ENDING_CAR)); option.setClosingWriterChar(props - .getProperty(FilterOption.ClosingWriterChar)); + .getProperty(FilterOption.CLOSING_WRITER_CHAR)); option.setOpeningWriterChar(props - .getProperty(FilterOption.OpeningWriterChar)); + .getProperty(FilterOption.OPENING_WRITER_CHAR)); option.setClosingTemplate(props - .getProperty(FilterOption.ClosingTemplate)); - option.setMimeType(props.getProperty(FilterOption.MimeType)); - option.setKey(props.getProperty(FilterOption.Key)); + .getProperty(FilterOption.CLOSING_TEMPLATE)); + option.setMimeType(props.getProperty(FilterOption.MIME_TYPE)); + option.setKey(props.getProperty(FilterOption.KEY)); option.setContentType(props - .getProperty(FilterOption.ContentType)); + .getProperty(FilterOption.CONTENT_TYPE)); // addfilters options filtersOptions.put(option.getKey(), option); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -1,19 +1,26 @@ package org.nuiton.wikitty.publication; +/** + * class used to store filter option used to decorate UI content inside + * wikittyPubText + * + * @author mfortun + * + */ public class FilterOption { - public static String OpeningTemplate = "OpeningTemplate"; - public static String WriteString = "WriteString"; - public static String StringDelim = "StringDelim"; - public static String ConcatChar = "ConcatChar"; - public static String EndingCar = "EndingCar"; - public static String ClosingWriterChar = "ClosingWriterChar"; - public static String OpeningWriterChar = "OpeningWriterChar"; - public static String ClosingTemplate = "ClosingTemplate"; - public static String MimeType = "MimeType"; - public static String Key = "Key"; - public static String ContentType = "ContentType"; + public static String OPENING_TEMPLATE = "OpeningTemplate"; + public static String WRITE_STRING = "WriteString"; + public static String STRING_DELIM = "StringDelim"; + public static String CONCAT_CHAR = "ConcatChar"; + public static String ENDING_CAR = "EndingCar"; + public static String CLOSING_WRITER_CHAR = "ClosingWriterChar"; + public static String OPENING_WRITER_CHAR = "OpeningWriterChar"; + public static String CLOSING_TEMPLATE = "ClosingTemplate"; + public static String MIME_TYPE = "MimeType"; + public static String KEY = "Key"; + public static String CONTENT_TYPE = "ContentType"; 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-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -34,8 +34,6 @@ import javax.script.ScriptEngineManager; import java.io.IOException; import java.io.InputStream; -import java.util.LinkedList; -import java.util.List; import java.util.Map; import java.util.Properties; @@ -67,6 +65,9 @@ static public String PUBLICATION_MIME_SEP = "."; static public String PREFIX_MIME_PUB_TEXT = "text"; + /** + * MimeType properties files name + */ static public String MIME_PROPERTIE = "mimetype.properties"; /** * match pub text that must be converted via ui decorateur text/\w*\.\w* as @@ -84,6 +85,7 @@ bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); + // load properties for mime type and file extension InputStream input = MimeTypePubHelper.class .getResourceAsStream("/mimetype.properties"); @@ -181,6 +183,14 @@ return result; } + /** + * return the convert part of a mime type, part used as a key + * for converter option. + * + * for example : text/html.java return html.java + * @param mime + * @return + */ public String pubUiMimeToConverterOption(String mime) { String result = mime; if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { @@ -189,6 +199,12 @@ return result; } + /** + * Used to convert uiMime to the mimeType after content decoration + * + * @param mime + * @return the mimeType after Ui content decoration + */ public String pubUiMimeToTargetMime(String mime) { String result = mime; if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java 2011-08-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPropertieIndex.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -3,9 +3,27 @@ import java.util.Properties; import java.util.Set; +/** + * + * Class used to store properties used as wikitty index. + * Used by the wikitty service over jar. + * + * @author mfortun + * + */ public class WikittyPropertieIndex { + /** + * Index for wikitty + * id-> path/wikittypubName + */ protected Properties wikittyIndex; + /** + * index for version information and mime type + * + * id.mimetype-> "mimetype" + * id.version -> "version" + */ protected Properties wikittyMetadata; @@ -29,6 +47,12 @@ this.wikittyMetadata = wikittyMetadata; } + /** + * return if the properties that index wikitty name and id + * contain the id + * @param id + * @return if the id is inside the index + */ public boolean containtId(String id){ return wikittyIndex.containsKey(id); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java 2011-08-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/JarUtil.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -146,6 +146,13 @@ return result; } + + /** + * + * @param jarFile + * @param fileOrDirectory + * @throws IOException + */ public static void compressFiles(File jarFile, File fileOrDirectory) throws IOException { @@ -272,6 +279,22 @@ compress(jarFile, fileOrDirectory, null, null, false); } + + /** + * If fileOrDirectory is directory Compress recursively all file in this + * directory, else if is just file compress one file. + * <p/> + * Entry result name in jar start at fileOrDirectory. example: if we + * compress /etc/apache, entry will be apache/http.conf, ... + * + * @param jarFile + * the target jar file + * @param fileOrDirectory + * the file or directory to compress + * @param mf the manifest for the jar + * @throws IOException + * if any problem while compressing + */ public static void compress(File jarFile, File fileOrDirectory, Manifest mf) throws IOException { compress(jarFile, fileOrDirectory, mf, null, false); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -59,7 +59,6 @@ static public String SOURCE_EXTENSION = ".java"; static public String COMPILED_EXTENSION = ".class"; - static public String PATH_SEPARATOR_PROPERTIE_KEY = "path.separator"; /* * needed to ensure that fileUtils used inside execution is set with the @@ -159,8 +158,6 @@ PropertiesExtended metaProperties = new PropertiesExtended( filePropertiesMeta); - metaProperties - .setProperty(PATH_SEPARATOR_PROPERTIE_KEY, File.separator); // iterate wikitty // - write file // - write property 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-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -1,7 +1,6 @@ package org.nuiton.wikitty.publication.externalize; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.util.Collection; import java.util.HashMap; @@ -12,7 +11,6 @@ import java.util.Properties; import java.util.jar.JarEntry; import java.util.jar.JarFile; - import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -37,7 +35,6 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextCompiledImpl; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; -import org.nuiton.wikitty.publication.synchro.WikittyPublicationFileSystem; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; @@ -53,6 +50,8 @@ public static String JAR_LOCATION_KEY = "wikitty.publication.repository.jar"; + public static String JAR_PATH_SEPARATOR = "/"; + /** Class logger. */ private static Log log = LogFactory.getLog(WikittyServiceJarLoader.class); @@ -80,8 +79,9 @@ constructIndex(); } - protected void constructIndex() { + protected void constructIndex() { try { + log.info("Initialize Jar Index on dir" + dirLocation); // initialise location File jarLocation = new File(dirLocation); //found jar @@ -387,8 +387,10 @@ wikittyMetadata = en.getValue().getWikittyMetadata(); } } + if (log.isDebugEnabled()){ + log.debug("restoring on "+ wikittyJarRepository); + } - String mime = wikittyMetadata.getProperty(wikittyId + WikittyPublicationExternalize.MIME_SUFFIX); String fileExtension = mimeHelper.getExtensionForMime(mime); @@ -405,9 +407,7 @@ wikit.addExtension(WikittyLabelImpl.extensionWikittyLabel); // set labels computate name - String sep = wikittyMetadata - .getProperty(WikittyPublicationExternalize.PATH_SEPARATOR_PROPERTIE_KEY); - String[] namPath = StringUtil.split(path, sep); + String[] namPath = StringUtil.split(path, JAR_PATH_SEPARATOR); String wikittyName = namPath[namPath.length - 1]; String label = ""; @@ -421,6 +421,9 @@ WikittyLabelHelper.addLabels(wikit, label); try { if (mimeHelper.isPubTextMime(mime)) { + if(log.isDebugEnabled()){ + log.debug("Handle Wikitty pubtext: " + wikit); + } // wikitty pub text compiled wikit.addExtension(WikittyPubTextImpl.extensions); wikit.addExtension(WikittyPubTextCompiledImpl.extensionWikittyPubTextCompiled); @@ -435,10 +438,15 @@ WikittyPubTextHelper.setContent(wikit, JarUtil .getStringContent(wikittyJarRepository, wikittyJared)); - WikittyPubTextCompiledHelper.setByteCode(wikit, JarUtil - .getByteContent(wikittyJarRepository, wikittyclass)); + byte[] bytCont= JarUtil + .getByteContent(wikittyJarRepository, wikittyclass); + + WikittyPubTextCompiledHelper.setByteCode(wikit,bytCont); } else { + if(log.isDebugEnabled()){ + log.debug("Handle Wikitty pubdata: " + wikit); + } // wikitty pub data wikit.addExtension(WikittyPubDataImpl.extensionWikittyPubData); WikittyPubDataHelper.setMimeType(wikit, mime); Modified: trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java =================================================================== --- trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java 2011-08-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication/src/site/exemple/resourceAppli/src/main/wp/Test.java 2011-08-29 15:02:04 UTC (rev 1198) @@ -1,3 +1,3 @@ -WikittyRessource tt = new WikittyRessourceImpl(); +WikittyResource tt = new WikittyResourceImpl(); return "yo"; Modified: trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-29 13:53:25 UTC (rev 1197) +++ trunk/wikitty-publication-ui/src/main/resources/wikitty-publication-ws-default.properties 2011-08-29 15:02:04 UTC (rev 1198) @@ -58,4 +58,4 @@ org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog wikitty.fallback.file=wikitty-publication-ws-fallback.properties -wikitty.fallback.override=false +wikitty.fallback.override=true