Author: bpoussin Date: 2010-12-11 04:03:58 +0100 (Sat, 11 Dec 2010) New Revision: 601 Url: http://nuiton.org/repositories/revision/wikitty/601 Log: ajout d'une nouvelle methode eval.doAction qui prend une chaine comme sous context Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEval.java 2010-12-11 00:59:37 UTC (rev 600) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionEval.java 2010-12-11 03:03:58 UTC (rev 601) @@ -1,6 +1,7 @@ package org.nuiton.wikitty.publication; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -12,6 +13,7 @@ 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.WikittyException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.entities.Wikitty; @@ -155,6 +157,21 @@ return result; } + public Object doAction(WikittyPublicationContext context, String subContextAsText) { + Object result; + if (subContextAsText == null || "".equals(subContextAsText)) { + result = getError(context); + } else { + if (subContextAsText.startsWith("/")) { + subContextAsText = subContextAsText.substring(1); + } + String[] subContextArray = StringUtil.split(subContextAsText, "/"); + List<String> subContext = Arrays.asList(subContextArray); + result = doAction(context, subContext); + } + return result; + } + @Override public Object doAction(WikittyPublicationContext context) { Object result; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2010-12-11 00:59:37 UTC (rev 600) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationContext.java 2010-12-11 03:03:58 UTC (rev 601) @@ -246,6 +246,7 @@ // load default configuration for all wikitty service String filename = String.format(patternConfigFilename, "default"); + log.info(String.format("Try to load config file '%s'", filename)); ApplicationConfig wsConfigDefault; try { wsConfigDefault = new ApplicationConfig(filename); @@ -263,6 +264,7 @@ // read specifique configuration with default config as default properties filename = String.format(patternConfigFilename, wsContext); + log.info(String.format("Try to load config file '%s'", filename)); ApplicationConfig wsConfig; try { wsConfig = new ApplicationConfig(wsConfigDefault.getFlatOptions()); Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2010-12-11 00:59:37 UTC (rev 600) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2010-12-11 03:03:58 UTC (rev 601) @@ -51,4 +51,4 @@ wikitty.addon.export.directory=${wikitty.data.directory}/export wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ wikitty.WikittyServiceAccessStat.components=\ -org.nuiton.wikitty.services.WikittyServiceAccessStat.AccessStatStorageWikitty +org.nuiton.wikitty.services.WikittyServiceAccessStat$AccessStatStorageWikitty