Author: mfortun Date: 2011-08-04 16:16:32 +0200 (Thu, 04 Aug 2011) New Revision: 1109 Url: http://nuiton.org/repositories/revision/wikitty/1109 Log: *Correction for fallBackService *Properties to use fallback with classic service and jarloader Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java trunk/wikitty-publication/src/main/resources/struts.xml 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-04 09:52:22 UTC (rev 1108) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-08-04 14:16:32 UTC (rev 1109) @@ -38,7 +38,8 @@ this.mainService = serv; if(config != null){ fallbackService = WikittyServiceFactory.buildWikittyService(config, - "wikitty." + config.getOption(WIKITTY_FALLBACK_PREFIX_KEY)); + "wikitty." + config.getOption(WIKITTY_FALLBACK_PREFIX_KEY)+"."); + } } @@ -183,8 +184,11 @@ public WikittyExtension restoreExtensionLastVersion(String securityToken, String name) { + WikittyExtension result = mainService.restoreExtensionLastVersion( securityToken, name); + + if (isFallBack() && result == null) { result = fallbackService.restoreExtensionLastVersion(securityToken, name); @@ -298,8 +302,16 @@ * in the fall back that aren't in the 11 first wikitty * of the main service */ + // remove null from the first result + List<String> fromMainWithoutNull= new LinkedList<String>(); + for(String st :currentResult.getAll()){ + if (st!=null){ + fromMainWithoutNull.add(st); + } + } + Criteria excluding = idNotInCriteriaConstructor( - critFallback, currentResult.getAll()); + critFallback,fromMainWithoutNull ); excluding.setEndIndex(resultSizeExpected - result.size()); @@ -312,11 +324,10 @@ tempExcludingCriteriaList).get(0); List<String> allresult = new LinkedList<String>(); - allresult.addAll(currentResult.getAll()); + allresult.addAll(fromMainWithoutNull); allresult.addAll(resultFallback.getAll()); - System.out.println(allresult.size()); - int number = currentResult.getNumFound() + int number = fromMainWithoutNull.size() + resultFallback.getNumFound(); // rebuilt the result @@ -338,9 +349,17 @@ public List<String> findByCriteria(String securityToken, List<Criteria> criteria) { - + + List<String> result = new LinkedList<String>(); - result.addAll(mainService.findByCriteria(securityToken, criteria)); + List<String> tempFromMain = mainService.findByCriteria(securityToken, + criteria); + // remove null element from result + for (String st : tempFromMain) { + if (st != null) { + result.add(st); + } + } if (isFallBack()) { @@ -351,7 +370,7 @@ // merge list List<String> resultFallback = new LinkedList<String>(); - resultFallback.addAll(findByCriteria(securityToken, criteria)); + resultFallback.addAll(fallbackService.findByCriteria(securityToken, criteria)); // this allow to element from main to prevail resultFallback.removeAll(result); @@ -359,6 +378,10 @@ } } + if (result.size()==0){ + result.add(null); + } + return result; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-04 09:52:22 UTC (rev 1108) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-08-04 14:16:32 UTC (rev 1109) @@ -60,10 +60,15 @@ @Override public String execute() throws Exception { + + proxy = getWikittyPublicationProxy(); Map<String, Object> param = ActionContext.getContext().getParameters(); this.formatArgs(param); + + + isDelete = param.containsKey("delete"); isStore = param.containsKey("store"); 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-04 09:52:22 UTC (rev 1108) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyServiceJarLoader.java 2011-08-04 14:16:32 UTC (rev 1109) @@ -233,10 +233,24 @@ @Override public WikittyExtension restoreExtensionLastVersion(String securityToken, String name) { - // TODO mfortun - throw new UnsupportedOperationException("not yet implemented"); - // return null; + if (name.equals(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + return WikittyPubTextImpl.extensionWikittyPubText; + } + + if (name.equals(WikittyPubTextCompiled.EXT_WIKITTYPUBTEXTCOMPILED)) { + return WikittyPubTextCompiledImpl.extensionWikittyPubTextCompiled; + } + + if (name.equals(WikittyPubData.EXT_WIKITTYPUBDATA)) { + return WikittyPubDataImpl.extensionWikittyPubData; + } + + if (name.equals(WikittyLabel.EXT_WIKITTYLABEL)) { + return WikittyLabelImpl.extensionWikittyLabel; + } + + return null; } @Override Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-04 09:52:22 UTC (rev 1108) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-08-04 14:16:32 UTC (rev 1109) @@ -71,7 +71,7 @@ </package> <!-- Action aviable only to logged user extends="restrictedArea" --> - <package name="publication" extends="restrictedArea"> + <package name="publication" extends="publicArea"> <action name="*/edit/*" class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> @@ -108,7 +108,7 @@ </action> </package> - <package name="fragment" namespace="/fragment" extends="restrictedArea"> + <package name="fragment" namespace="/fragment" extends="publicArea"> <action name="wikittyInfo" class="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"> <result>/WEB-INF/jsp/wikittyInfo.jsp</result> </action> 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-04 09:52:22 UTC (rev 1108) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-fallback.properties 2011-08-04 14:16:32 UTC (rev 1109) @@ -23,8 +23,8 @@ # #L% ### -wikitty.data.directory=./targetBD2/data -wikitty.service.server.url=http://localhost:2222/wikitty +wikitty.data.directory=./targetBD1/data +wikitty.service.server.url=http://localhost:1111/wikitty wikitty.storage.jdbc.queryfile=wikitty-jdbc-query.properties wikitty.storage.jdbc.driver=org.h2.Driver wikitty.storage.jdbc.host=jdbc:h2:file:${wikitty.data.directory}/data/db @@ -37,6 +37,7 @@ wikitty.searchengine.solr.directory.data=${wikitty.data.directory}/data/solr wikitty.searchengine.solr.directory.factory=solr.StandardDirectoryFactory wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceStorage,\ +org.nuiton.wikitty.publication.WikittyPublicationFallbackService,\ org.nuiton.wikitty.services.WikittyServiceNotifier,\ org.nuiton.wikitty.services.WikittyServiceCached,\ org.nuiton.wikitty.services.WikittyServiceSecurity,\ @@ -56,3 +57,8 @@ wikitty.addon.export.publicurl=file://${wikitty.data.directory}/export/ 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 +