Author: mfortun Date: 2011-07-12 11:34:27 +0200 (Tue, 12 Jul 2011) New Revision: 1077 Url: http://nuiton.org/repositories/revision/wikitty/1077 Log: * add new method for mimeTypeHelper * fix some import * correct restore for wikitty save as jar 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/WikittyServiceJarLoader.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/AbstractWikittyFileService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/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/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-12 08:46:28 UTC (rev 1076) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-12 09:34:27 UTC (rev 1077) @@ -3,7 +3,6 @@ import java.io.File; import java.io.IOException; import java.io.PrintWriter; -import java.util.ArrayList; import java.util.Set; import org.apache.commons.lang.StringEscapeUtils; import org.nuiton.util.ApplicationConfig; 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-07-12 08:46:28 UTC (rev 1076) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-07-12 09:34:27 UTC (rev 1077) @@ -80,6 +80,7 @@ public WikittyServiceJarLoader(ApplicationConfig config) { try { + File jarLocation = new File(config.getOption(JAR_LOCATION_KEY)); wikittyJarRepository = new JarFile(jarLocation); @@ -363,7 +364,9 @@ WikittyLabelHelper.addLabels(wikit, label); - if (mimeHelper.isPubTextMime(fileExtension)) { + + + if (mimeHelper.isPubTextExtension(fileExtension)) { // wikitty pub text compiled wikit.addExtension(WikittyPubTextImpl.extensions); wikit.addExtension(WikittyPubTextCompiledImpl.extensionWikittyPubTextCompiled); Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/AbstractWikittyFileService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/AbstractWikittyFileService.java 2011-07-12 08:46:28 UTC (rev 1076) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/AbstractWikittyFileService.java 2011-07-12 09:34:27 UTC (rev 1077) @@ -1,6 +1,6 @@ package org.nuiton.wikitty.publication.synchro; -import java.io.File; + import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; @@ -11,11 +11,8 @@ import java.util.Map.Entry; import java.util.regex.Matcher; import java.util.regex.Pattern; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; -import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyUtil; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-07-12 08:46:28 UTC (rev 1076) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-07-12 09:34:27 UTC (rev 1077) @@ -63,6 +63,7 @@ mimePubText.add("application/javascript"); mapExtensionMime.put("wp", "application/javascript"); + mapExtensionMime.put("js", "application/javascript"); mapExtensionMime.put("jpg", "image/jpeg"); mapExtensionMime.put("png", "image/png"); } @@ -112,7 +113,15 @@ public boolean isPubTextMime(String mimeType) { return mimePubText.contains(mimeType); } + + + public boolean isPubTextExtension(String extension) { + return isPubTextMime(getMimeForExtension(extension)); + } + + + /** * Add a mimeType corresponding to a WikittyPubText * 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-07-12 08:46:28 UTC (rev 1076) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-07-12 09:34:27 UTC (rev 1077) @@ -34,12 +34,10 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; import java.util.Set; -import java.util.Map.Entry; import org.apache.commons.collections.BidiMap; import org.apache.commons.collections.bidimap.DualHashBidiMap; import org.apache.commons.logging.Log; @@ -63,9 +61,7 @@ import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.publication.entities.WikittyPubTextImpl; import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.TreeNodeResult; -import org.nuiton.wikitty.search.operators.Restriction; import org.nuiton.wikitty.services.WikittyEvent; import org.nuiton.wikitty.services.WikittyListener; import org.nuiton.wikitty.publication.synchro.WikittyFileUtil;