Author: mfortun Date: 2011-07-28 15:33:54 +0200 (Thu, 28 Jul 2011) New Revision: 1099 Url: http://nuiton.org/repositories/revision/wikitty/1099 Log: * add externalize methods Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.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-28 13:27:31 UTC (rev 1098) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-07-28 13:33:54 UTC (rev 1099) @@ -41,7 +41,8 @@ */ public class WikittyPublicationExternalize { - static private Log log = LogFactory.getLog(WikittyPublicationExternalize.class); + static private Log log = LogFactory + .getLog(WikittyPublicationExternalize.class); static public String TEMPORARY_FILE_NAME = "tempBeforeJar"; static public String DEFAULT_JAR_NAME = "pub-externalized"; @@ -81,14 +82,29 @@ appconfig.setOption(WikittyConfigOption.WIKITTY_SERVER_URL.getKey(), urlFileSystem); - WikittyProxy proxy = new WikittyProxy( - WikittyServiceFactory.buildWikittyService(appconfig)); + externalize(appconfig); + } + + static public void externalize(ApplicationConfig conf) + throws ArgumentsParserException, IOException { // Found all wikity on the file System Criteria findAllCrit = Search.query().keyword("*").criteria(); - PagedResult<Wikitty> allWikittyOnFS = proxy - .findAllByCriteria(findAllCrit); + externalize(conf, findAllCrit); + } + + static public void externalize(ApplicationConfig conf, Criteria crit) + throws ArgumentsParserException, IOException { + + File currentFile = new File("."); + currentFile = new File(currentFile.getAbsolutePath()).getParentFile(); + + WikittyProxy proxy = new WikittyProxy( + WikittyServiceFactory.buildWikittyService(conf)); + + PagedResult<Wikitty> allWikittyOnFS = proxy.findAllByCriteria(crit); + // make tempfile File tempDirectory = new File(currentFile + File.separator + TEMPORARY_FILE_NAME); @@ -162,8 +178,6 @@ wikittyFile.createNewFile(); FileUtil.writeString(wikittyFile, content); - WikittyPubText currentPubText = new WikittyPubTextImpl(wikit); - File javaFile = new File(tempDirectory.getAbsolutePath() + File.separator + labelPath + name + SOURCE_EXTENSION); javaFile.createNewFile(); @@ -213,6 +227,7 @@ // delete tempfile FileUtil.deleteRecursively(tempDirectory); + } /* @@ -242,7 +257,7 @@ UiCodeDecorator uidecDecorator = new UiCodeDecorator(); if (uidecDecorator.isTransformationNeeded(wikitty)) { try { - wikitty= uidecDecorator.transformPubUIToPubText(wikitty); + wikitty = uidecDecorator.transformPubUIToPubText(wikitty); } catch (IOException e) { log.debug("Error while transform ui"); }