Author: mfortun Date: 2011-08-09 10:33:30 +0200 (Tue, 09 Aug 2011) New Revision: 1112 Url: http://nuiton.org/repositories/revision/wikitty/1112 Log: *change how fallback service is load from property file Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-08 12:28:44 UTC (rev 1111) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-09 08:33:30 UTC (rev 1112) @@ -7,6 +7,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.entities.Wikitty; @@ -19,14 +20,28 @@ import org.nuiton.wikitty.services.WikittyListener; /** - * class meant to handle multicontext for wikitty publication. + * class meant to handle multicontext for wikitty publication. If want to use + * this, you must declare in your properties file the WIKITTY_FALLBACK_FILE_KEY + * property that declare the name of the property file needed to initialize + * fallbackService * * @author mfortun * */ public class WikittyPublicationFallbackService implements WikittyService { - static public String WIKITTY_FALLBACK_PREFIX_KEY = "wikitty.fallback.prefix"; + /** + * property that define the name of the property file needed to initialize + * fallback service + * */ + static public String WIKITTY_FALLBACK_FILE_KEY = "wikitty.fallback.file"; + + /** + * property flag to know if copy property from the main appconfig and + * overide them with the content of the fallback property file or just tak + * it as standalone + */ + static public String WIKITTY_FALLBACK_OVERRIDE="wikitty.fallback.override"; static private Log log = LogFactory.getLog(WikittyPublicationFallbackService.class); @@ -34,12 +49,23 @@ protected WikittyService fallbackService; public WikittyPublicationFallbackService(WikittyService serv, - ApplicationConfig config) { + ApplicationConfig config) throws ArgumentsParserException { this.mainService = serv; if(config != null){ - fallbackService = WikittyServiceFactory.buildWikittyService(config, - "wikitty." + config.getOption(WIKITTY_FALLBACK_PREFIX_KEY)+"."); - + boolean isOverriding = config.getOptionAsBoolean(WIKITTY_FALLBACK_OVERRIDE); + String fileName = config.getOption(WIKITTY_FALLBACK_FILE_KEY); + + if (fileName!=null){ + ApplicationConfig confFallBack=null; + if (isOverriding){ + confFallBack= new ApplicationConfig(null, null,config.getFlatOptions(), fileName); + + }else{ + confFallBack= new ApplicationConfig(fileName); + } + confFallBack.parse(null); + fallbackService = WikittyServiceFactory.buildWikittyService(confFallBack); + } } } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-08 12:28:44 UTC (rev 1111) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-08-09 08:33:30 UTC (rev 1112) @@ -164,6 +164,8 @@ bindings.put(WikittyPublicationConstant.WIKITTY_VAR, w); bindings.put(WikittyPublicationConstant.EVAL_VAR, this); + // TODO mfortun-2011-08-08 construire un class path avec + // des jar et les classes contenu dans wikitty publication result = ScriptEvaluator.eval(null, criteria.getName(), content, mimetype, bindings); } 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-08 12:28:44 UTC (rev 1111) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-09 08:33:30 UTC (rev 1112) @@ -66,6 +66,15 @@ * * } */ + + /* + * + * Possible d'uploader un diagramme uml + * le mettre dedans un wikittypubdata + * et généré le jar avec les sources en fonction de ce modèle + * + * On saura que c'est un modèle grace au mime type + */ public WikittyServiceJarLoader(ApplicationConfig config) { try { Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-08 12:28:44 UTC (rev 1111) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-09 08:33:30 UTC (rev 1112) @@ -58,7 +58,6 @@ wikitty.WikittyServiceAccessStat.components=\ org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageLog -wikitty.fallback.prefix = prefix -wikitty.prefix.WikittyService.components=org.nuiton.wikitty.publication.externalize.WikittyServiceJarLoader -wikitty.publication.repository.jar=/home/Manou/testWP/pub-externalized.jar +wikitty.fallback.file=wikitty-publication-ws-jar.properties +wikitty.fallback.override=false