May 2011 - Wikitty-commits - mailman.cloud.codelutin.com

r911 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 21 May '11

21 May '11

Author: bpoussin Date: 2011-05-21 13:36:45 +0200 (Sat, 21 May 2011) New Revision: 911 Url: http://nuiton.org/repositories/revision/wikitty/911 Log: Evolution #1544: add proxy.restore(Set) method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-05-20 16:05:23 UTC (rev 910) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-05-21 11:36:45 UTC (rev 911) @@ -55,6 +55,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; import org.nuiton.wikitty.entities.WikittyTokenHelper; import org.nuiton.wikitty.search.TreeNodeResult; @@ -372,13 +373,18 @@ /** * Restore wikitty entity with specified id or {@code null} if entity can't be be found. * - * @param id entity id + * @param id entity ids if null return is empty list * @return wikitty entity with specified id or {@code null} if entity can't be found */ public List<Wikitty> restore(List<String> id) { long start = TimeLog.getTime(); - List<Wikitty> result = wikittyService.restore(securityToken, id); + List<Wikitty> result; + if (id == null) { + result = new ArrayList<Wikitty>(); + } else { + result = wikittyService.restore(securityToken, id); + } timeLog.log(start, "restoreWikitty<list>"); return result; @@ -390,7 +396,7 @@ * * @param <E> object type * @param clazz entity class - * @param id entity id + * @param id entity ids if null return is empty list * @param checkExtension if true check that Wikitty result has all extension * @return wikitty entity with specified id or {@code null} if entity * can't be found or if one wikitty don't have extension wanted by E type @@ -398,39 +404,40 @@ public <E extends BusinessEntity> List<E> restore( Class<E> clazz, List<String> id, boolean checkExtension) { long start = TimeLog.getTime(); - - List<Wikitty> wikitties = wikittyService.restore(securityToken, id); List<E> result = new ArrayList<E>(); - for (Wikitty w : wikitties) { - HashSet<String> extNames = null; - if (checkExtension) { - extNames = new HashSet<String>(w.getExtensionNames()); - } - E dto = WikittyUtil.newInstance( - securityToken, wikittyService, clazz, w); - if (checkExtension) { - // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityImpl b = (BusinessEntityImpl) dto; - for (WikittyExtension ext : b.getStaticExtensions()) { - if (!extNames.contains(ext.getName())) { - // extension wanted by BusinessEntity (clazz) - // is not in wikitty, then wikitty is not good type - // for business - result = null; + if (id != null) { + List<Wikitty> wikitties = wikittyService.restore(securityToken, id); + for (Wikitty w : wikitties) { + HashSet<String> extNames = null; + if (checkExtension) { + extNames = new HashSet<String>(w.getExtensionNames()); + } + + E dto = WikittyUtil.newInstance( + securityToken, wikittyService, clazz, w); + if (checkExtension) { + // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl + BusinessEntityImpl b = (BusinessEntityImpl) dto; + for (WikittyExtension ext : b.getStaticExtensions()) { + if (!extNames.contains(ext.getName())) { + // extension wanted by BusinessEntity (clazz) + // is not in wikitty, then wikitty is not good type + // for business + result = null; + break; + } + } + // le break au dessus permet de soritr d'une boucle + // met si result est null il faut sortir de la methode et donc + // sortir de la deuxieme boucle + if (result == null) { break; } } - // le break au dessus permet de soritr d'une boucle - // met si result est null il faut sortir de la methode et donc - // sortir de la deuxieme boucle - if (result == null) { - break; - } + result.add(dto); } - result.add(dto); } - timeLog.log(start, "restore<list>"); return result; } @@ -440,6 +447,31 @@ return result; } + public Set<Wikitty> restore(Set<String> id) { + ArrayList<String> list = null; + if (id != null) { + list = new ArrayList<String>(id); + } + List<Wikitty> resultList = restore(list); + Set<Wikitty> result = new HashSet<Wikitty>(resultList); + return result; + } + + public <E extends BusinessEntity> Set<E> restore(Class<E> clazz, Set<String> id) { + Set<E> result = restore(clazz, id, false); + return result; + } + + public <E extends BusinessEntity> Set<E> restore(Class<E> clazz, Set<String> id, boolean checkExtension) { + ArrayList<String> list = null; + if (id != null) { + list = new ArrayList<String>(id); + } + List<E> resultList = restore(clazz, list, checkExtension); + Set<E> result = new HashSet<E>(resultList); + return result; + } + public void delete(String id) { long start = TimeLog.getTime(); wikittyService.delete(securityToken, id);

1 0

r910 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 20 May '11

20 May '11

Author: mfortun Date: 2011-05-20 18:05:23 +0200 (Fri, 20 May 2011) New Revision: 910 Url: http://nuiton.org/repositories/revision/wikitty/910 Log: * correct redirection's url Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-20 14:15:51 UTC (rev 909) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-20 16:05:23 UTC (rev 910) @@ -25,18 +25,21 @@ import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + import org.apache.struts2.ServletActionContext; +import org.apache.struts2.interceptor.RequestAware; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.publication.action.PublicationActionView; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; - /** - * Interceptor used to redirect a non-logged user if he tries to access a page - * where logging is mandatory + * Interceptor used to redirect a non-logged user if he tries to access a page + * where logging is mandatory */ public class LoginInterceptor extends AbstractInterceptor { private static final long serialVersionUID = -7520186185205372272L; @@ -50,27 +53,30 @@ public void setError(String error) { this.error = error; } - - + @Override public String intercept(ActionInvocation invocation) throws Exception { + Map<String, Object> session = ActionContext.getContext().getSession(); - - WikittyPublicationSession pubSession = WikittyPublicationSession.getWikittyPublicationSession(session); + + WikittyPublicationSession pubSession = WikittyPublicationSession + .getWikittyPublicationSession(session); WikittyUser user = pubSession.getUser(); String result = null; - + + HttpServletRequest request = ServletActionContext.getRequest(); - //If the user isn't logged in + error = request.getContextPath() + error ; + error += "?success="+request.getServletPath(); + + // If the user isn't logged in if (user == null) { ServletActionContext.getResponse().sendRedirect(error); } else { - result = invocation.invoke(); + result = invocation.invoke(); } - + return result; } - - }

1 0

r909 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 20 May '11

20 May '11

Author: mfortun Date: 2011-05-20 16:15:51 +0200 (Fri, 20 May 2011) New Revision: 909 Url: http://nuiton.org/repositories/revision/wikitty/909 Log: * futur service to handle multicontext instead of using a proxy Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java 2011-05-20 14:15:51 UTC (rev 909) @@ -0,0 +1,163 @@ +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); + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r908 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 20 May '11

20 May '11

Author: mfortun Date: 2011-05-20 16:09:19 +0200 (Fri, 20 May 2011) New Revision: 908 Url: http://nuiton.org/repositories/revision/wikitty/908 Log: * Correct url construction in view page Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-20 14:09:19 UTC (rev 908) @@ -1,24 +1,22 @@ package org.nuiton.wikitty.publication.action; - import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.operators.Element; - import com.opensymphony.xwork2.ActionContext; -public class PublicationActionView extends PublicationBaseAction { +public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; protected String search = "*"; protected int first = 0; protected int end = 100; - + + /** * */ @@ -32,12 +30,15 @@ @Override public String execute() throws Exception { + // search = this.getArgument("r", "*"); // first = this.getArgument("first", "0"); // end = this.getArgument("end", "100"); String id = getArgument("id", ""); + + if (!"".equals(id)) { wikittyResult = getWikittyPublicationProxy().restore(id); } @@ -102,14 +103,7 @@ this.end = end; } - public String makeUrlEdit(Wikitty w) { + - String result = getArgument("context", "") + "/edit/" + Element.ELT_ID - + ":" + w.getId() + ".action"; - return (result); - - } - - } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-20 14:09:19 UTC (rev 908) @@ -122,4 +122,14 @@ } + + public String getContextArgs(){ + return (String) ActionContext.getContext().getParameters().get(CONTEXT_KEY); + } + + public String getArgs(){ + return (String) ActionContext.getContext().getParameters().get(ARGS_KEY); + } + + } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-20 14:09:19 UTC (rev 908) @@ -5,106 +5,106 @@ <struts> - <constant name="struts.devMode" value="true" /> - <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> - <constant name="struts.enable.SlashesInActionNames" value="true" /> + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + <constant name="struts.enable.SlashesInActionNames" value="true" /> -  - <package name="publicArea" extends="struts-default"> - <interceptors> - <interceptor-stack name="publicAreaStack"> - <interceptor-ref name="defaultStack"> +  + <package name="publicArea" extends="struts-default"> + <interceptors> + <interceptor-stack name="publicAreaStack"> + <interceptor-ref name="defaultStack"> - </interceptor-ref> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="publicAreaStack" /> - </package> + </interceptor-ref> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="publicAreaStack" /> + </package> -  - <package name="loginArea" extends="publicArea"> - <interceptors> - <interceptor name="logout" - class="org.nuiton.wikitty.publication.LogoutInterceptor" /> - <interceptor-stack name="loginAreaStack"> - <interceptor-ref name="logout" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="loginAreaStack" /> - </package> +  + <package name="loginArea" extends="publicArea"> + <interceptors> + <interceptor name="logout" + class="org.nuiton.wikitty.publication.LogoutInterceptor" /> + <interceptor-stack name="loginAreaStack"> + <interceptor-ref name="logout" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="loginAreaStack" /> + </package> -  - <package name="restrictedArea" extends="publicArea"> - <interceptors> - <interceptor name="login" - class="org.nuiton.wikitty.publication.LoginInterceptor"> - <param name="error">login_input.action</param> - </interceptor> - <interceptor-stack name="restrictedAreaStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="restrictedAreaStack" /> - </package> +  + <package name="restrictedArea" extends="publicArea"> + <interceptors> + <interceptor name="login" + class="org.nuiton.wikitty.publication.LoginInterceptor"> + <param name="error">/login_input.action</param> + </interceptor> + <interceptor-stack name="restrictedAreaStack"> + <interceptor-ref name="login" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="restrictedAreaStack" /> + </package> - <package name="login" extends="loginArea"> - <action name="register_*" method="{1}" - class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> - <result name="input">register.jsp</result> - <result type="redirect">index.jsp</result> - </action> - <action name="login_*" method="{1}" - class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> - <result name="input">login.jsp</result> - <result name="success" type="redirect">${success}</result> - <result name="error" type="redirect">${error}</result> - </action> - <action name="logout" - class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> - <result type="redirect">${success}</result> - </action> - </package> + <package name="login" extends="loginArea"> + <action name="register_*" method="{1}" + class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> + <result name="input">/register.jsp</result> + <result type="redirect">/index.jsp</result> + </action> + <action name="login_*" method="{1}" + class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> + <result name="input">login.jsp</result> + <result name="success" type="redirect">${success}</result> + <result name="error" type="redirect">${error}</result> + </action> + <action name="logout" + class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> + <result type="redirect">${success}</result> + </action> + </package> -  - <package name="publication" extends="restrictedArea"> +  + <package name="publication" extends="restrictedArea"> - <action name="*/edit/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/edit.jsp</result> - </action> + <action name="*/edit/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/edit.jsp</result> + </action> - <action name="*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/view.jsp</result> - </action> + <action name="*/view/*" + class="org.nuiton.wikitty.publication.action.PublicationActionView"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/view.jsp</result> + </action> - <action name="*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">mimeType</param> - <param name="inputName">inputStream</param> - </result> - </action> + <action name="*/raw/*" + class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">mimeType</param> + <param name="inputName">inputStream</param> + </result> + </action> - <action name="*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">mimeType</param> - <param name="inputName">inputStream</param> - </result> - </action> - </package> + <action name="*/eval/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">mimeType</param> + <param name="inputName">inputStream</param> + </result> + </action> + </package> </struts> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-20 14:09:19 UTC (rev 908) @@ -92,11 +92,12 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:url var="editlink" action="wiki/edit"> - <s:param name="id"><%=w.getId()%></s:param> - </s:url> <s:a href="%{editlink}" id="regenPermToken"> - <s:text name="edit" /> - </s:a> <a href="<%=action.makeUrlEdit(w)%>">edit</a></td> + <td><s:set var="wid"><%=w.getId()%></s:set> <s:set var="localContext"><%=action.getContextArgs()%></s:set> + <s:url var="urledit" action="%{#localContext}/edit/elt_id:%{#wid}" /> + <a href="${urledit}">Edit</a> <s:url var="urlraw" + action="%{#localContext}/raw/elt_id:%{#wid}" /> <a href="${urlraw}">Raw</a> + <s:url var="urleval" action="%{#localContext}/eval/elt_id:%{#wid}" /> + <a href="${urleval}">Eval</a></td> <td><input type="submit" name="id" value="<%=w.getId()%>" /> </td>

1 0

r907 - trunk/wikitty-publication
by mfortun＠users.nuiton.org 20 May '11

20 May '11

Author: mfortun Date: 2011-05-20 12:19:56 +0200 (Fri, 20 May 2011) New Revision: 907 Url: http://nuiton.org/repositories/revision/wikitty/907 Log: * change tab inserted to space Modified: trunk/wikitty-publication/pom.xml Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-05-20 10:10:46 UTC (rev 906) +++ trunk/wikitty-publication/pom.xml 2011-05-20 10:19:56 UTC (rev 907) @@ -1,158 +1,158 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.1-SNAPSHOT</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.8.0.GA</version> + <scope>runtime</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: publication</name> + <name>Wikitty :: publication</name> - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> -  -  -  +  +  +  - <packaging>war</packaging> + <packaging>war</packaging> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/models</directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - </inputs> - <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> - <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> - <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> + <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> + <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <properties> - <struts2Version>2.2.3</struts2Version> - </properties> + <properties> + <struts2Version>2.2.3</struts2Version> + </properties> </project>

1 0

r906 - trunk/wikitty-publication
by mfortun＠users.nuiton.org 20 May '11

20 May '11

Author: mfortun Date: 2011-05-20 12:10:46 +0200 (Fri, 20 May 2011) New Revision: 906 Url: http://nuiton.org/repositories/revision/wikitty/906 Log: * remove redundant dependency * change struts version to 2.2.3 Modified: trunk/wikitty-publication/pom.xml Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-05-19 15:40:38 UTC (rev 905) +++ trunk/wikitty-publication/pom.xml 2011-05-20 10:10:46 UTC (rev 906) @@ -1,78 +1,76 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.1-SNAPSHOT</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - - <dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> <version>${struts2Version}</version> @@ -86,77 +84,75 @@ </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.8.0.GA</version> + <scope>runtime</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: publication</name> + <name>Wikitty :: publication</name> - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> -  -  -  +  +  +  - <packaging>war</packaging> + <packaging>war</packaging> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/models</directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - </inputs> - <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> - <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> - <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> + <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> + <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - - </build> - - <properties> - <struts2Version>2.2.1.1</struts2Version> - </properties> + <properties> + <struts2Version>2.2.3</struts2Version> + </properties> </project>

1 0

r905 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication resources
by mfortun＠users.nuiton.org 19 May '11

19 May '11

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

1 0

r904 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 18 May '11

18 May '11

Author: mfortun Date: 2011-05-18 18:08:36 +0200 (Wed, 18 May 2011) New Revision: 904 Url: http://nuiton.org/repositories/revision/wikitty/904 Log: * multicontext need to save user in both, still a bug in there Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 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 14:51:41 UTC (rev 903) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 16:08:36 UTC (rev 904) @@ -13,6 +13,7 @@ import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.entities.WikittyUserHelper; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; @@ -67,7 +68,6 @@ .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); - WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws, configFallBack, fallservice); result.setSecurityToken(token); @@ -102,7 +102,7 @@ if (serviceFallback == null) { serviceFallback = WikittyServiceFactory .buildWikittyService(config); - + } } } @@ -209,6 +209,24 @@ public <E extends BusinessEntity> E store(E e) { E result = null; + + /* + * if a user store in both + */ + 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 + fallbackProxy.store(e); + mainProxy.store(temp); + + return e; + } + // if there a fallback proxy and e exist on it, we try to store it again // on fallbackproxy if (isFallbackService() @@ -223,9 +241,18 @@ public Wikitty store(Wikitty w) { Wikitty result = null; + + /* + * if a user store in both + */ + if (isFallbackService() && w.hasExtension(WikittyUser.EXT_WIKITTYUSER)) { + fallbackProxy.store(w); + return mainProxy.store(w); + } + // if there a fallback proxy and e exist on it, we try to store it again // on fallbackproxy - if (isFallbackService() && fallbackProxy.restore(w.getId()) != null) { + if ((isFallbackService() && fallbackProxy.restore(w.getId()) != null)) { result = fallbackProxy.store(w); } else { result = mainProxy.store(w);

1 0

r903 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org 18 May '11

18 May '11

Author: mfortun Date: 2011-05-18 16:51:41 +0200 (Wed, 18 May 2011) New Revision: 903 Url: http://nuiton.org/repositories/revision/wikitty/903 Log: * remove redundant invoke that causes a bug with eval action Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-18 14:25:50 UTC (rev 902) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-18 14:51:41 UTC (rev 903) @@ -65,13 +65,9 @@ if (user == null) { ServletActionContext.getResponse().sendRedirect(error); } else { - result = invocation.invoke(); + result = invocation.invoke(); } - - - - result = invocation.invoke(); return result; }

1 0

r902 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 18 May '11

18 May '11

Author: mfortun Date: 2011-05-18 16:25:50 +0200 (Wed, 18 May 2011) New Revision: 902 Url: http://nuiton.org/repositories/revision/wikitty/902 Log: * add light properties that only instanciate client service * remove unused import in jsp * multicontext bug correction Added: 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/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/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 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-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java 2011-05-18 14:25:50 UTC (rev 902) @@ -80,7 +80,7 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), - "wikitty-publication-ws-fallback.properties", String.class, false, false); + "wikitty-publication-ws-lightfallback.properties", String.class, false, false); @@ -144,10 +144,11 @@ CONFIG_FILE( ApplicationConfig.CONFIG_FILE_NAME, _("wikitty-publication.config.configFileName.description"), - "wikitty-publication-ws-default.properties", String.class, false, false); + "wikitty-publication-ws-light.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-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-18 14:25:50 UTC (rev 902) @@ -67,6 +67,7 @@ .getFallBackConfig(); WikittyService fallservice = getWikittyServiceFallBack(configFallBack); + WikittyPublicationProxy result = new WikittyPublicationProxy(config, ws, configFallBack, fallservice); result.setSecurityToken(token); @@ -101,6 +102,7 @@ if (serviceFallback == null) { serviceFallback = WikittyServiceFactory .buildWikittyService(config); + } } } 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-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java 2011-05-18 14:25:50 UTC (rev 902) @@ -25,6 +25,8 @@ protected WikittyUser user; 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-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-18 14:25:50 UTC (rev 902) @@ -70,7 +70,7 @@ </action> </package> -  +  <package name="publication" extends="restrictedArea"> <action name="*/edit/*" Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties 2011-05-18 14:25:50 UTC (rev 902) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + + +wikitty.service.server.url=http://localhost:2222/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-light.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties 2011-05-18 14:25:50 UTC (rev 902) @@ -0,0 +1,28 @@ +### +# #%L +# Wikitty :: publication +# +# $Id: wikitty-publication-ws-default.properties 823 2011-04-20 14:45:47Z mfortun $ +# $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-publication/src/main/resour… $ +# %% +# Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Lesser Public License for more details. +# +# You should have received a copy of the GNU General Lesser Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/lgpl-3.0.html>. +# #L% +### + + +wikitty.service.server.url=http://localhost:1111/wikitty +wikitty.WikittyService.components=org.nuiton.wikitty.services.WikittyServiceCajoClient Property changes on: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-lightfallback.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-18 14:25:50 UTC (rev 902) @@ -29,17 +29,15 @@ --%> <%@page import="org.nuiton.wikitty.publication.action.PublicationActionEdit"%> -<%@page import="org.nuiton.wikitty.publication.ActionEval"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.FieldType"%> <%@page import="java.util.Collection"%> <%@page import="org.nuiton.wikitty.WikittyProxy"%> <%@page import="org.nuiton.wikitty.WikittyService"%> <%@page import="org.nuiton.wikitty.entities.WikittyExtension"%> -<%@page import="org.nuiton.wikitty.publication.ActionEdit"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@page import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> + <% PublicationActionEdit action = PublicationActionEdit.getAction(); Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-17 15:34:30 UTC (rev 901) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-18 14:25:50 UTC (rev 902) @@ -36,10 +36,6 @@ <%@page import="org.nuiton.wikitty.search.Search"%> <%@page import="org.nuiton.wikitty.publication.WikittyPublicationSession"%> -<%@page import="org.nuiton.wikitty.publication.ActionEval"%> -<%@page import="org.nuiton.wikitty.publication.ActionEdit"%> -<%@page - import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> @@ -96,7 +92,7 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:url var="editlink" action="/wiki/edit"> + <td><s:url var="editlink" action="wiki/edit"> <s:param name="id"><%=w.getId()%></s:param> </s:url> <s:a href="%{editlink}" id="regenPermToken"> <s:text name="edit" />

1 0