Author: mfortun Date: 2011-05-24 17:52:09 +0200 (Tue, 24 May 2011) New Revision: 919 Url: http://nuiton.org/repositories/revision/wikitty/919 Log: * rename wikitty service multicontext with a proper name * correct constructor to handle fallback service's instantiation with a mechanism of prefix inside property file Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java Removed: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java (from rev 916, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java) =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java 2011-05-24 15:52:09 UTC (rev 919) @@ -0,0 +1,168 @@ +package org.nuiton.wikitty.publication; + +import java.util.Collection; +import java.util.List; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.WikittyServiceFactory; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.TreeNodeResult; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittyListener; + +/** + * class meant to handle multicontext for wikitty publication. + * + * @author mfortun + * + */ +public class WikittyPublicationFallbackService implements WikittyService { + + static public String WIKITTY_FALLBACK_PREFIX_KEY = "wikitty.fallback.prefix"; + + protected WikittyService mainService; + protected WikittyService fallbackService; + + public WikittyPublicationFallbackService(WikittyService serv, + ApplicationConfig config) { + this.mainService = serv; + fallbackService = WikittyServiceFactory.buildWikittyService(config, + "wikitty." + config.getOption(WIKITTY_FALLBACK_PREFIX_KEY)); + } + + public boolean isFallBack() { + return fallbackService != null; + } + + /* + * TODO mfortun-2011-05-20 see if allow a special mode to enable login on + * both wikitty service, see if fallback service has to be construct with a + * special stack of component in the application config under specific + * properties name, or if the fallback service is already construct and pass + * threw this constructor + */ + + public void addWikittyServiceListener(WikittyListener listener, + ServiceListenerType type) { + mainService.addWikittyServiceListener(listener, type); + } + + public void removeWikittyServiceListener(WikittyListener listener, + ServiceListenerType type) { + mainService.removeWikittyServiceListener(listener, type); + } + + public String login(String login, String password) { + return mainService.login(login, password); + } + + public void logout(String securityToken) { + mainService.logout(securityToken); + } + + public WikittyEvent clear(String securityToken) { + return mainService.clear(securityToken); + } + + public boolean canWrite(String securityToken, Wikitty wikitty) { + return mainService.canWrite(securityToken, wikitty); + } + + public boolean canDelete(String securityToken, String wikittyId) { + return mainService.canDelete(securityToken, wikittyId); + } + + public boolean canRead(String securityToken, String wikittyId) { + return mainService.canRead(securityToken, wikittyId); + } + + public boolean exists(String securityToken, String wikittyId) { + return mainService.exists(securityToken, wikittyId); + } + + public boolean isDeleted(String securityToken, String wikittyId) { + return mainService.isDeleted(securityToken, wikittyId); + } + + public WikittyEvent replay(String securityToken, List<WikittyEvent> events, + boolean force) { + return mainService.replay(securityToken, events, force); + } + + public WikittyEvent store(String securityToken, + Collection<Wikitty> wikitties, boolean force) { + return mainService.store(securityToken, wikitties, force); + } + + public List<String> getAllExtensionIds(String securityToken) { + return mainService.getAllExtensionIds(securityToken); + } + + public List<String> getAllExtensionsRequires(String securityToken, + String extensionName) { + return mainService.getAllExtensionsRequires(securityToken, + extensionName); + } + + public WikittyEvent storeExtension(String securityToken, + Collection<WikittyExtension> exts) { + return mainService.storeExtension(securityToken, exts); + } + + public WikittyEvent deleteExtension(String securityToken, + Collection<String> extNames) { + return mainService.deleteExtension(securityToken, extNames); + } + + public WikittyExtension restoreExtension(String securityToken, + String extensionId) { + return mainService.restoreExtension(securityToken, extensionId); + } + + public WikittyExtension restoreExtensionLastVersion(String securityToken, + String name) { + return mainService.restoreExtensionLastVersion(securityToken, name); + } + + public List<Wikitty> restore(String securityToken, List<String> id) { + return mainService.restore(securityToken, id); + } + + public WikittyEvent delete(String securityToken, Collection<String> ids) { + return mainService.delete(securityToken, ids); + } + + public List<PagedResult<String>> findAllByCriteria(String securityToken, + List<Criteria> criteria) { + return mainService.findAllByCriteria(securityToken, criteria); + } + + public List<String> findByCriteria(String securityToken, + List<Criteria> criteria) { + return mainService.findByCriteria(securityToken, criteria); + } + + public WikittyEvent deleteTree(String securityToken, String treeNodeId) { + return mainService.deleteTree(securityToken, treeNodeId); + } + + public TreeNodeResult<String> findTreeNode(String securityToken, + String wikittyId, int depth, boolean count, Criteria filter) { + return mainService.findTreeNode(securityToken, wikittyId, depth, count, + filter); + } + + public Wikitty restoreVersion(String securityToken, String wikittyId, + String version) { + return mainService.restoreVersion(securityToken, wikittyId, version); + } + + public void syncSearchEngine(String securityToken) { + mainService.syncSearchEngine(securityToken); + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationFallbackService.java ___________________________________________________________________ Added: svn:mime-type + text/plain Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java 2011-05-24 15:46:53 UTC (rev 918) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java 2011-05-24 15:52:09 UTC (rev 919) @@ -1,163 +0,0 @@ -package org.nuiton.wikitty.publication; - -import java.util.Collection; -import java.util.List; - -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.search.TreeNodeResult; -import org.nuiton.wikitty.services.WikittyEvent; -import org.nuiton.wikitty.services.WikittyListener; - -/** - * class meant to handle multicontext for wikitty publication. - * @author mfortun - * - */ -public class WikittyPublicationMultiService implements WikittyService { - - protected WikittyService mainService; - protected WikittyService fallbackService; - - public WikittyPublicationMultiService(WikittyService serv, - ApplicationConfig config) { - this.mainService = serv; - - } - - public boolean isFallBack() { - return fallbackService != null; - } - - /* - * TODO mfortun-2011-05-20 see if allow a special mode to enable login on - * both wikitty service, see if fallback service has to be construct with a - * special stack of component in the application config under specific - * properties name, or if the fallback service is already construct and pass - * threw this constructor - */ - - public void addWikittyServiceListener(WikittyListener listener, - ServiceListenerType type) { - mainService.addWikittyServiceListener(listener, type); - } - - public void removeWikittyServiceListener(WikittyListener listener, - ServiceListenerType type) { - mainService.removeWikittyServiceListener(listener, type); - } - - public String login(String login, String password) { - return mainService.login(login, password); - } - - public void logout(String securityToken) { - mainService.logout(securityToken); - } - - public WikittyEvent clear(String securityToken) { - return mainService.clear(securityToken); - } - - public boolean canWrite(String securityToken, Wikitty wikitty) { - return mainService.canWrite(securityToken, wikitty); - } - - public boolean canDelete(String securityToken, String wikittyId) { - return mainService.canDelete(securityToken, wikittyId); - } - - public boolean canRead(String securityToken, String wikittyId) { - return mainService.canRead(securityToken, wikittyId); - } - - public boolean exists(String securityToken, String wikittyId) { - return mainService.exists(securityToken, wikittyId); - } - - public boolean isDeleted(String securityToken, String wikittyId) { - return mainService.isDeleted(securityToken, wikittyId); - } - - public WikittyEvent replay(String securityToken, List<WikittyEvent> events, - boolean force) { - return mainService.replay(securityToken, events, force); - } - - public WikittyEvent store(String securityToken, - Collection<Wikitty> wikitties, boolean force) { - return mainService.store(securityToken, wikitties, force); - } - - public List<String> getAllExtensionIds(String securityToken) { - return mainService.getAllExtensionIds(securityToken); - } - - public List<String> getAllExtensionsRequires(String securityToken, - String extensionName) { - return mainService.getAllExtensionsRequires(securityToken, - extensionName); - } - - public WikittyEvent storeExtension(String securityToken, - Collection<WikittyExtension> exts) { - return mainService.storeExtension(securityToken, exts); - } - - public WikittyEvent deleteExtension(String securityToken, - Collection<String> extNames) { - return mainService.deleteExtension(securityToken, extNames); - } - - public WikittyExtension restoreExtension(String securityToken, - String extensionId) { - return mainService.restoreExtension(securityToken, extensionId); - } - - public WikittyExtension restoreExtensionLastVersion(String securityToken, - String name) { - return mainService.restoreExtensionLastVersion(securityToken, name); - } - - public List<Wikitty> restore(String securityToken, List<String> id) { - return mainService.restore(securityToken, id); - } - - public WikittyEvent delete(String securityToken, Collection<String> ids) { - return mainService.delete(securityToken, ids); - } - - public List<PagedResult<String>> findAllByCriteria(String securityToken, - List<Criteria> criteria) { - return mainService.findAllByCriteria(securityToken, criteria); - } - - public List<String> findByCriteria(String securityToken, - List<Criteria> criteria) { - return mainService.findByCriteria(securityToken, criteria); - } - - public WikittyEvent deleteTree(String securityToken, String treeNodeId) { - return mainService.deleteTree(securityToken, treeNodeId); - } - - public TreeNodeResult<String> findTreeNode(String securityToken, - String wikittyId, int depth, boolean count, Criteria filter) { - return mainService.findTreeNode(securityToken, wikittyId, depth, count, - filter); - } - - public Wikitty restoreVersion(String securityToken, String wikittyId, - String version) { - return mainService.restoreVersion(securityToken, wikittyId, version); - } - - public void syncSearchEngine(String securityToken) { - mainService.syncSearchEngine(securityToken); - } - -}