Author: mfortun Date: 2011-05-19 17:40:38 +0200 (Thu, 19 May 2011) New Revision: 905 Url: http://nuiton.org/repositories/revision/wikitty/905 Log: * multicontext is ready improvement #1501 Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-19 15:40:38 UTC (rev 905) @@ -145,10 +145,9 @@ ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), "wikitty-publication-ws-light.properties", String.class, false, false); + // "wikitty-publication-ws-default.properties", String.class, false, false); + - //wikitty-publication-ws-light.properties - //wikitty-publication-ws-default.properties - public final String key; public final String description; public String defaultValue; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-19 15:40:38 UTC (rev 905) @@ -12,6 +12,9 @@ import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; +import org.nuiton.wikitty.entities.WikittyLabel; +import org.nuiton.wikitty.entities.WikittyLabelImpl; import org.nuiton.wikitty.entities.WikittyUser; import org.nuiton.wikitty.entities.WikittyUserHelper; import org.nuiton.wikitty.search.Criteria; @@ -20,6 +23,8 @@ import org.nuiton.wikitty.search.TreeNodeResult; import org.nuiton.wikitty.services.WikittyEvent; +import com.arjuna.ats.internal.jdbc.drivers.modifiers.list; + /** * Proxy use by action in wikitty publication it encapsulate two wikitty proxy * because we can have two distinct service use to store wikitty used by @@ -137,6 +142,20 @@ return fallbackProxy.getWikittyService(); } + public String getFallbackSecurityToken() { + String result = ""; + if (isFallbackService()) { + result = fallbackProxy.getSecurityToken(); + } + return result; + } + + public void setFallbackSecurityToken(String securityToken) { + if (isFallbackService()) { + fallbackProxy.setSecurityToken(securityToken); + } + } + /* * Beginning of redefinition method that take care of merge between result * of the proxy and fallback proxy if any @@ -158,17 +177,11 @@ public String getSecurityToken() { String result = mainProxy.getSecurityToken(); - - // TODO mfortun-2011-05-16 do something on fallback ? - return result; } public void setSecurityToken(String securityToken) { mainProxy.setSecurityToken(securityToken); - if (isFallbackService()) { - fallbackProxy.setSecurityToken(securityToken); - } } public WikittyUser getUser() { @@ -216,13 +229,12 @@ if (isFallbackService() && e.getExtensionNames().contains(WikittyUser.EXT_WIKITTYUSER)) { - - BusinessEntity temp = new BusinessEntityImpl(); - temp.copyFrom(e); - - // FIXME mfortun-2011-05-18 here correct what cause the bug + // save the version to restore it after to allow storage of the + // wikitty on the two service + String version = e.getWikittyVersion(); fallbackProxy.store(e); - mainProxy.store(temp); + e.setWikittyVersion(version); + mainProxy.store(e); return e; } @@ -530,7 +542,9 @@ PagedResult<E> resultTempFromFall = fallbackProxy .findAllByExample(e, 0, missingNumber, fieldFacet); - List<E> completedResultList = result.getAll(); + List<E> completedResultList = new ArrayList<E>(); + + completedResultList.addAll(result.getAll()); completedResultList.addAll(resultTempFromFall.getAll()); int totalNumberofFound = result.getNumFound() @@ -559,9 +573,10 @@ public <E extends BusinessEntity> List<PagedResult<E>> findAllByCriteria( Class<E> clazz, List<Criteria> criterias) { - List<PagedResult<E>> result = mainProxy.findAllByCriteria(clazz, - criterias); + List<PagedResult<E>> result = new ArrayList<PagedResult<E>>(); + result.addAll(mainProxy.findAllByCriteria(clazz, criterias)); + if (isFallbackService()) { for (int i = 0; i < result.size(); i++) { @@ -633,8 +648,10 @@ PagedResult<E> resultFallback = fallbackProxy .findAllByCriteria(clazz, excluding); - List<E> allresult = currentResult.getAll(); + List<E> allresult = new ArrayList<E>(); + allresult.addAll(currentResult.getAll()); allresult.addAll(resultFallback.getAll()); + int number = currentResult.getNumFound() + resultFallback.getNumFound(); @@ -707,7 +724,8 @@ PagedResult<E> resultFallback = fallbackProxy .findAllByCriteria(clazz, excluding); - List<E> allresult = result.getAll(); + List<E> allresult = new ArrayList<E>(); + allresult.addAll(result.getAll()); allresult.addAll(resultFallback.getAll()); int number = result.getNumFound() + resultFallback.getNumFound(); @@ -809,7 +827,8 @@ PagedResult<Wikitty> resultFallback = fallbackProxy .findAllByCriteria(excluding); - List<Wikitty> allresult = currentResult.getAll(); + List<Wikitty> allresult = new ArrayList<Wikitty>(); + allresult.addAll(currentResult.getAll()); allresult.addAll(resultFallback.getAll()); int number = currentResult.getNumFound() + resultFallback.getNumFound(); @@ -883,7 +902,9 @@ PagedResult<Wikitty> resultFallback = fallbackProxy .findAllByCriteria(excluding); - List<Wikitty> allresult = result.getAll(); + List<Wikitty> allresult = new ArrayList<Wikitty>(); + allresult.addAll(result.getAll()); + allresult.addAll(resultFallback.getAll()); int number = result.getNumFound() + resultFallback.getNumFound(); @@ -984,7 +1005,8 @@ PagedResult<String> resultFallback = fallbackProxy .findAllIdByCriteria(excluding); - List<String> allresult = currentResult.getAll(); + List<String> allresult = new ArrayList<String>(); + allresult.addAll(currentResult.getAll()); allresult.addAll(resultFallback.getAll()); int number = currentResult.getNumFound() + resultFallback.getNumFound(); @@ -1053,7 +1075,8 @@ PagedResult<String> resultFallback = fallbackProxy .findAllIdByCriteria(excluding); - List<String> allresult = result.getAll(); + List<String> allresult = new ArrayList<String>(); + allresult.addAll(result.getAll()); allresult.addAll(resultFallback.getAll()); int number = result.getNumFound() + resultFallback.getNumFound(); @@ -1082,17 +1105,20 @@ public List<String> findIdByCriteria(List<Criteria> criteria) { - List<String> result = mainProxy.findIdByCriteria(criteria); + List<String> result = new ArrayList<String>(); + result.addAll(mainProxy.findIdByCriteria(criteria)); if (isFallbackService()) { - if (result == null) { - result = fallbackProxy.findIdByCriteria(criteria); + if (result.size() == 0) { + result.addAll(fallbackProxy.findIdByCriteria(criteria)); } else { // merge list - List<String> resultFallback = fallbackProxy - .findIdByCriteria(criteria); + List<String> resultFallback = new ArrayList<String>(); + + resultFallback.addAll(fallbackProxy.findIdByCriteria(criteria)); // this allow to element from main to prevail + resultFallback.removeAll(result); result.addAll(resultFallback); } @@ -1144,11 +1170,12 @@ public <E extends BusinessEntity> List<E> findByCriteria(Class<E> clazz, List<Criteria> criterias) { - List<E> result = mainProxy.findByCriteria(clazz, criterias); + List<E> result = new ArrayList<E>(); + result.addAll(mainProxy.findByCriteria(clazz, criterias)); if (isFallbackService()) { - if (result == null) { - result = fallbackProxy.findByCriteria(clazz, criterias); + if (result.size() == 0) { + result.addAll(fallbackProxy.findByCriteria(clazz, criterias)); } else { // merge list List<E> resultFallback = fallbackProxy.findByCriteria(clazz, @@ -1205,11 +1232,13 @@ public List<Wikitty> findByCriteria(List<Criteria> criteria) { - List<Wikitty> result = mainProxy.findByCriteria(criteria); + List<Wikitty> result = new ArrayList<Wikitty>(); + result.addAll(mainProxy.findByCriteria(criteria)); + if (isFallbackService()) { - if (result == null) { - result = fallbackProxy.findByCriteria(criteria); + if (result.size() == 0l) { + result.addAll(fallbackProxy.findByCriteria(criteria)); } else { // merge list List<Wikitty> resultFallback = fallbackProxy Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-19 15:40:38 UTC (rev 905) @@ -26,8 +26,8 @@ public WikittyPublicationSession() { //proxy = WikittyPublicationProxy.getInstance(null); - //proxy = WikittyPublicationProxy.getInstanceWithFallback(null); proxy = WikittyPublicationProxy.getInstanceWithFallback(null); + } /** Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-19 15:40:38 UTC (rev 905) @@ -42,7 +42,7 @@ <interceptors> <interceptor name="login" class="org.nuiton.wikitty.publication.LoginInterceptor"> - <param name="error">/wikitty-publication/login_input.action</param> + <param name="error">login_input.action</param> </interceptor> <interceptor-stack name="restrictedAreaStack"> <interceptor-ref name="login" /> Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-19 15:40:38 UTC (rev 905) @@ -24,5 +24,5 @@ ### -wikitty.service.server.url=http://localhost:2222/wikitty +wikitty.service.server.url=http://localhost:1111/wikitty wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-18 16:08:36 UTC (rev 904) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-19 15:40:38 UTC (rev 905) @@ -24,5 +24,5 @@ ### -wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.service.server.url=http://localhost:2222/wikitty wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient