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

r935 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 07 Jun '11

07 Jun '11

Author: mfortun Date: 2011-06-07 10:34:47 +0200 (Tue, 07 Jun 2011) New Revision: 935 Url: http://nuiton.org/repositories/revision/wikitty/935 Log: * Correct url construction in redirect mechanism * Correct url construction in view page for view link Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 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-06-06 15:28:53 UTC (rev 934) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-06-07 08:34:47 UTC (rev 935) @@ -24,15 +24,11 @@ package org.nuiton.wikitty.publication; 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; @@ -66,12 +62,14 @@ HttpServletRequest request = ServletActionContext.getRequest(); - error = request.getContextPath() + error ; - error += "?success="+request.getServletPath(); + + // Construct redirect url. + String redirect = request.getContextPath() + error ; + redirect += "?success="+request.getServletPath(); // If the user isn't logged in if (user == null) { - ServletActionContext.getResponse().sendRedirect(error); + ServletActionContext.getResponse().sendRedirect(redirect); } else { result = invocation.invoke(); } Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-06 15:28:53 UTC (rev 934) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-07 08:34:47 UTC (rev 935) @@ -108,13 +108,16 @@ action="%{#localContext}/eval/elt_id:%{#wid}" /> <a href="${urleval}">Eval</a> <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> + + <s:url + var="urlFragment" action="/fragment/wikittyInfo" /> <script type='text/javascript'> jQuery(document).ready(function () { var options_ajaxlink_<%=i%> = {}; options_ajaxlink_<%=i%>.jqueryaction = "anchor"; options_ajaxlink_<%=i%>.id = "ajaxlink_<%=i%>"; options_ajaxlink_<%=i%>.targets = "partnersInfo"; - options_ajaxlink_<%=i%>.href = "/wikitty-publication/fragment/wikittyInfo.action"; + options_ajaxlink_<%=i%>.href = "${urlFragment}"; options_ajaxlink_<%=i%>.hrefparameter = "id=<%=w.getId()%>"; jQuery.struts2_jquery.bind(jQuery('#ajaxlink_<%=i%>'),options_ajaxlink_<%=i%>); });

1 0

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

06 Jun '11

Author: mfortun Date: 2011-06-06 17:28:53 +0200 (Mon, 06 Jun 2011) New Revision: 934 Url: http://nuiton.org/repositories/revision/wikitty/934 Log: * add jquery to pom * change view page: change post method to ajax query with jquery * add action to support ajax change and corresponding action jsp Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp Modified: trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-06-06 15:22:40 UTC (rev 933) +++ trunk/wikitty-publication/pom.xml 2011-06-06 15:28:53 UTC (rev 934) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1.3-SNAPSHOT</version> </parent>  @@ -83,6 +83,11 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> + </dependency> <dependency> <groupId>commons-fileupload</groupId> Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java 2011-06-06 15:28:53 UTC (rev 934) @@ -0,0 +1,45 @@ +package org.nuiton.wikitty.publication.action; + +import org.nuiton.wikitty.entities.Wikitty; + +import com.opensymphony.xwork2.ActionContext; + +public class PublicationActionRestoreWikitty extends PublicationBaseAction { + + /** + * + */ + private static final long serialVersionUID = 279959059921233642L; + protected String id; + protected Wikitty wikitty; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + + static public PublicationActionRestoreWikitty getAction() { + return (PublicationActionRestoreWikitty) ActionContext.getContext() + .get(CONTEXT_ACTION_KEY); + } + + @Override + public String execute() throws Exception { + + wikitty = getWikittyPublicationProxy().restore(id); + + return SUCCESS; + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRestoreWikitty.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-06-06 15:22:40 UTC (rev 933) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-06-06 15:28:53 UTC (rev 934) @@ -107,4 +107,11 @@ </result> </action> </package> + + <package name="fragment" namespace="/fragment" extends="restrictedArea"> + <action name="wikittyInfo" class="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"> + <result>/WEB-INF/jsp/wikittyInfo.jsp</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-06-06 15:22:40 UTC (rev 933) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-06 15:28:53 UTC (rev 934) @@ -40,6 +40,9 @@ <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> +<%@taglib prefix="sj" uri="/struts-jquery-tags"%> +<sj:head jquerytheme="default"/> + <h1>Wikitty View</h1> <% @@ -49,17 +52,6 @@ PublicationActionView action = PublicationActionView .getAction(); - /* - WikittyPublicationContext context = (WikittyPublicationContext) request - .getAttribute(ActionEval.CONTEXT_VAR); - PagedResult<Wikitty> pagedResult = (PagedResult<Wikitty>) request - .getAttribute("pagedResult"); - Wikitty wikitty = (Wikitty) request - .getAttribute(ActionEval.WIKITTY_VAR); - - ActionEdit actionEdit = context.getAction(ActionEdit.class); - */ - Wikitty wikit = action.getWikittyResult(); if (wikit != null) { @@ -69,6 +61,16 @@ <% } %> +<div> + +<div id="partnersInfo"> + <img src="/img/indicator.gif" + alt="Loading..." style="display: none" /> +</div> + +</div> + + <form action="view.action" method="post"> <div> <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> @@ -76,11 +78,13 @@ <s:textfield label="First" key="first" name="first" /> <s:textfield label="End" key="end" name="end" /> <input type="submit" name="search" value="Search" /> - <pre> + + <pre> WikittyFound: <%=action.getPagedResult().getNumFound()%></pre> + + <br/> -</pre> - <table> + <table border="1"> <tr> <td></td> <td>Wikitty Id</td> @@ -91,28 +95,48 @@ <% + int i=0; for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <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()%>" title="chaussette" /> + <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> + <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> + <script type='text/javascript'> + jQuery(document).ready(function () { + var options_ajaxlink_<%=i%> = {}; + options_ajaxlink_<%=i%>.jqueryaction = "anchor"; + options_ajaxlink_<%=i%>.id = "ajaxlink_<%=i%>"; + options_ajaxlink_<%=i%>.targets = "partnersInfo"; + options_ajaxlink_<%=i%>.href = "/wikitty-publication/fragment/wikittyInfo.action"; + options_ajaxlink_<%=i%>.hrefparameter = "id=<%=w.getId()%>"; + jQuery.struts2_jquery.bind(jQuery('#ajaxlink_<%=i%>'),options_ajaxlink_<%=i%>); + }); + </script> + </td> - + <td><%=w.getId()%></td> <td><%=w.getVersion()%></td> <td><%=w.getExtensionNames()%></td> </tr> <% + i++; } %> - - - + + + </table> - <input type="submit" name="previous" value="previous" /> - <input type="submit" name="next" value="next" /> + <input type="submit" name="previous" value="previous" /> <input + type="submit" name="next" value="next" /> </form> + + + + \ No newline at end of file Added: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp (rev 0) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-06-06 15:28:53 UTC (rev 934) @@ -0,0 +1,22 @@ +<%@page import="org.apache.commons.lang.StringEscapeUtils"%> +<%@page import="org.nuiton.wikitty.entities.Wikitty"%> +<%@page + import="org.nuiton.wikitty.publication.action.PublicationActionRestoreWikitty"%> +<%@taglib prefix="s" uri="/struts-tags"%> + +<% + PublicationActionRestoreWikitty action = PublicationActionRestoreWikitty + .getAction(); + Wikitty wiki = action.getWikitty(); + if (wiki != null) { +%> +<pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wiki))%></pre> +<% + } + action.getId(); +%> + + + + + Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r933 - trunk
by mfortun＠users.nuiton.org 06 Jun '11

06 Jun '11

Author: mfortun Date: 2011-06-06 17:22:40 +0200 (Mon, 06 Jun 2011) New Revision: 933 Url: http://nuiton.org/repositories/revision/wikitty/933 Log: * add jquery to parent pom for wikitty publication Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-06-01 14:29:46 UTC (rev 932) +++ trunk/pom.xml 2011-06-06 15:22:40 UTC (rev 933) @@ -373,6 +373,12 @@ <version>1.5.0</version> </dependency> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${struts2jqueryVersion}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -554,7 +560,7 @@ <jettyVersion>7.2.1.v20101111</jettyVersion> <hbaseVersion>0.89.0-SNAPSHOT</hbaseVersion> - + <struts2jqueryVersion>3.0.2</struts2jqueryVersion>  <locales>fr,en</locales>

1 0

r932 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 01 Jun '11

01 Jun '11

Author: mfortun Date: 2011-06-01 16:29:46 +0200 (Wed, 01 Jun 2011) New Revision: 932 Url: http://nuiton.org/repositories/revision/wikitty/932 Log: * add buttons next and previous in view page. Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 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-31 15:31:17 UTC (rev 931) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-06-01 14:29:46 UTC (rev 932) @@ -6,63 +6,20 @@ import org.nuiton.wikitty.search.Search; 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 String searchRequest = "*"; protected int first = 0; protected int end = 100; - - - - /** - * - */ - private static final long serialVersionUID = -4927699544115089591L; + protected String id; - static public PublicationActionView getAction() { - return (PublicationActionView) ActionContext.getContext().get( - CONTEXT_ACTION_KEY); - } + protected String search = ""; + protected String next = ""; + protected String previous = ""; - @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); - } - - searchForWikitties(); - - return SUCCESS; - } - - protected void searchForWikitties() { - - String r = search; - - int firstIndex = first; - int endIndex = end; - - Criteria criteria = Search.query().keyword(r).criteria(); - criteria.setFirstIndex(firstIndex); - criteria.setEndIndex(endIndex); - - pagedResult = getWikittyPublicationProxy().findAllByCriteria(criteria); - - } - public PagedResult<Wikitty> getPagedResult() { return pagedResult; } @@ -79,12 +36,12 @@ this.wikittyResult = wikittyResult; } - public String getSearch() { - return search; + public String getSearchRequest() { + return searchRequest; } - public void setSearch(String search) { - this.search = search; + public void setSearchRequest(String searchRequest) { + this.searchRequest = searchRequest; } public int getFirst() { @@ -103,7 +60,86 @@ this.end = end; } - + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSearch() { + return search; + } + + public void setSearch(String search) { + this.search = search; + } + + public String getNext() { + return next; + } + + public void setNext(String next) { + this.next = next; + } + + public String getPrevious() { + return previous; + } + + public void setPrevious(String previous) { + this.previous = previous; + } + + /** + * + */ + private static final long serialVersionUID = -4927699544115089591L; + + static public PublicationActionView getAction() { + return (PublicationActionView) ActionContext.getContext().get( + CONTEXT_ACTION_KEY); + } + + @Override + public String execute() throws Exception { + + if (!"".equals(next)) { + int oldbegin = first; + first = end; + end = end + (end - oldbegin); + } + if (!"".equals(previous)) { + + int oldEnd = end; + end = first; + first = first - (oldEnd - first); + + } + + if (end < 0) { + end = 0; + } + + if (first < 0) { + first = 0; + } + + if ("".equals(searchRequest)) { + searchRequest = "*"; + } + + wikittyResult = getWikittyPublicationProxy().restore(id); + + // search wikitties + Criteria criteria = Search.query().keyword(searchRequest).criteria(); + criteria.setFirstIndex(first); + criteria.setEndIndex(end); + + pagedResult = getWikittyPublicationProxy().findAllByCriteria(criteria); + + return SUCCESS; + } + } 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-31 15:31:17 UTC (rev 931) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-06-01 14:29:46 UTC (rev 932) @@ -39,6 +39,7 @@ <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@taglib prefix="s" uri="/struts-tags"%> + <h1>Wikitty View</h1> <% @@ -70,11 +71,11 @@ %> <form action="view.action" method="post"> <div> - <textarea title="Search" name="search"><%=action.getSearch()%></textarea> + <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> </div> <s:textfield label="First" key="first" name="first" /> <s:textfield label="End" key="end" name="end" /> - <input type="submit" name="id" value="Search" /> + <input type="submit" name="search" value="Search" /> <pre> </pre> @@ -88,6 +89,7 @@ </tr> + <% for (Wikitty w : action.getPagedResult().getAll()) { %> @@ -98,7 +100,7 @@ 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><input type="submit" name="id" value="<%=w.getId()%>" title="chaussette" /> </td> <td><%=w.getVersion()%></td> @@ -107,5 +109,10 @@ <% } %> + + + </table> + <input type="submit" name="previous" value="previous" /> + <input type="submit" name="next" value="next" /> </form>

1 0