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

r881 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 10, 2011

May 10, 2011

Author: mfortun Date: 2011-05-10 09:57:31 +0200 (Tue, 10 May 2011) New Revision: 881 Url: http://nuiton.org/repositories/revision/wikitty/881 Log: * improve 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-09 16:08:27 UTC (rev 880) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-10 07:57:31 UTC (rev 881) @@ -11,6 +11,10 @@ protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; + protected String search; + protected String first; + protected String end; + /** * @@ -25,24 +29,29 @@ @Override public String execute() throws Exception { - + + search = this.getArgument("r", "*"); + first = this.getArgument("first", "0"); + end = this.getArgument("end", "100"); + + String id = getArgument("id", ""); System.out.println(id); if (!"".equals(id)) { wikittyResult = getWikittyPublicationProxy().restore(id); } - SearchForAllWikitty(); + searchForWikitties(); return SUCCESS; } - protected void SearchForAllWikitty() { + protected void searchForWikitties() { - String r = "*"; + String r = search; - int firstIndex = 0; - int endIndex = 100; + int firstIndex = Integer.parseInt(first); + int endIndex = Integer.parseInt(end); Criteria criteria = Search.query().keyword(r).criteria(); criteria.setFirstIndex(firstIndex); @@ -68,4 +77,31 @@ this.wikittyResult = wikittyResult; } + public String getSearch() { + return search; + } + + public void setSearch(String search) { + this.search = search; + } + + public String getFirst() { + return first; + } + + public void setFirst(String first) { + this.first = first; + } + + public String getEnd() { + return end; + } + + public void setEnd(String end) { + this.end = end; + } + + + + } 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-09 16:08:27 UTC (rev 880) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-10 07:57:31 UTC (rev 881) @@ -76,12 +76,12 @@ <form action="view.action" method="post"> <div> - <textarea name="r" rows="4" cols="20"><%=action.getArgument("r", "*")%></textarea> + <textarea name="r" rows="4" cols="20"><%=action.getSearch()%></textarea> </div> <label for="first">First</label> <input type="text" name="first" - value="<%=action.getArgument("first", "0")%>" /> <label for="first">First</label> + value="<%=action.getFirst()%>" /> <label for="first">End</label> <input type="text" name="end" - value="<%=action.getArgument("end", "100")%>" /> <input type="submit" + value="<%=action.getEnd()%>" /> <input type="submit" name="id" value="Search" /> <pre>

1 0

r880 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action resources webapp webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 9, 2011

May 9, 2011

Author: mfortun Date: 2011-05-09 18:08:27 +0200 (Mon, 09 May 2011) New Revision: 880 Url: http://nuiton.org/repositories/revision/wikitty/880 Log: * edit page in progress Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.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/index.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-09 16:08:27 UTC (rev 880) @@ -1,5 +1,8 @@ package org.nuiton.wikitty.publication.action; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; + import com.opensymphony.xwork2.ActionContext; public class PublicationActionEdit extends PublicationBaseAction{ @@ -9,13 +12,40 @@ */ private static final long serialVersionUID = -590087371230933701L; + + protected Wikitty wikitty; + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); } + @Override + public String execute() throws Exception { + + String id = getArgument("id", ""); + + if ("".equals(id)){ + wikitty = new WikittyImpl(); + }else{ + wikitty = getWikittyPublicationProxy().restore(id); + } + + + + return SUCCESS; + } + + public Wikitty getWikitty() { + return wikitty; + } + + public void setWikitty(Wikitty wikitty) { + this.wikitty = wikitty; + } + } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 16:08:27 UTC (rev 880) @@ -13,7 +13,7 @@ <package name="test" extends="struts-default"> - <action name="editPage" + <action name="*/edit/*" class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> <param name="context">{1}</param> <param name="args">{2}</param> 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-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-09 16:08:27 UTC (rev 880) @@ -28,6 +28,7 @@ Author : poussin --%> +<%@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"%> @@ -40,11 +41,20 @@ <%@page import="org.nuiton.wikitty.publication.WikittyPublicationContext"%> <% + +PublicationActionEdit action = PublicationActionEdit.getAction(); + +Wikitty wikitty = action.getWikitty(); + +/* WikittyPublicationContext context = (WikittyPublicationContext) request.getAttribute(ActionEval.CONTEXT_VAR); Wikitty wikitty = (Wikitty)request.getAttribute(ActionEval.WIKITTY_VAR); ActionEdit action = context.getAction(ActionEdit.class); String url = action.makeUrl(context, wikitty); + +*/ +String url = "TODO"; %> <h1>Edit <%=wikitty.getId()%></h1> @@ -60,7 +70,7 @@ <legend><span class="legend">Extensions</span></legend> Current extension: <%=wikitty.getExtensionNames()%> <% - WikittyProxy proxy = context.getWikittyProxy(); + WikittyProxy proxy = action.getWikittyPublicationProxy(); Collection<String> allExt = proxy.getAllExtensionIds(); if (allExt != null && allExt.size() > 0) { %> Modified: trunk/wikitty-publication/src/main/webapp/index.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/index.jsp 2011-05-09 15:48:29 UTC (rev 879) +++ trunk/wikitty-publication/src/main/webapp/index.jsp 2011-05-09 16:08:27 UTC (rev 880) @@ -17,7 +17,7 @@ </s:a> -<s:url var="regenPermToken" action="edit" /> +<s:url var="regenPermToken" action="wiki/edit" /> <s:a href="%{regenPermToken}" id="regenPermToken"> <s:text name="edit" /> </s:a>

1 0

r879 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 9, 2011

May 9, 2011

Author: mfortun Date: 2011-05-09 17:48:29 +0200 (Mon, 09 May 2011) New Revision: 879 Url: http://nuiton.org/repositories/revision/wikitty/879 Log: * correct view * add skeleton of edit action Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 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 Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-09 15:48:29 UTC (rev 879) @@ -0,0 +1,21 @@ +package org.nuiton.wikitty.publication.action; + +import com.opensymphony.xwork2.ActionContext; + +public class PublicationActionEdit extends PublicationBaseAction{ + + /** + * + */ + private static final long serialVersionUID = -590087371230933701L; + + + static public PublicationActionEdit getAction() { + return (PublicationActionEdit) ActionContext.getContext().get( + CONTEXT_ACTION_KEY); + } + + + + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java ___________________________________________________________________ Added: svn:mime-type + text/plain 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-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-09 15:48:29 UTC (rev 879) @@ -10,6 +10,7 @@ public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; + protected Wikitty wikittyResult; /** * @@ -24,10 +25,15 @@ @Override public String execute() throws Exception { - System.out.println(ActionContext.getContext().getParameters()); + String id = getArgument("id", ""); + System.out.println(id); + if (!"".equals(id)) { + wikittyResult = getWikittyPublicationProxy().restore(id); + } + SearchForAllWikitty(); - + return SUCCESS; } @@ -54,7 +60,12 @@ this.pagedResult = pagedResult; } - - - + public Wikitty getWikittyResult() { + return wikittyResult; + } + + public void setWikittyResult(Wikitty wikittyResult) { + this.wikittyResult = wikittyResult; + } + } 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-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-09 15:48:29 UTC (rev 879) @@ -1,8 +1,12 @@ package org.nuiton.wikitty.publication.action; +import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Map.Entry; + import org.apache.struts2.interceptor.SessionAware; +import org.nuiton.util.StringUtil; import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; @@ -158,11 +162,22 @@ } public String getArgument(String key, String defaultValue) { - String result = ActionContext.getContext().getParameters().get(key) - .toString(); + Object temp = ActionContext.getContext().getParameters().get(key); - if (result == null) { + String result = ""; + // TODO mfortun-2011-05-09 fix this with something clean + if (temp == null) { result = defaultValue; + } else { + if (temp instanceof String[]) { + for (String t : (String[]) temp) { + result += t; + } + } else { + result = temp.toString(); + + } + } return result; } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-09 15:48:29 UTC (rev 879) @@ -13,18 +13,20 @@ <package name="test" extends="struts-default"> - <action name="editPage"> - + <action name="editPage" + 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="*/raw/*" class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> <param name="context">{1}</param> @@ -35,8 +37,6 @@ </result> </action> - - <action name="*/eval/*" class="org.nuiton.wikitty.publication.action.PublicationActionEval"> <param name="context">{1}</param> 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-09 14:21:16 UTC (rev 878) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-09 15:48:29 UTC (rev 879) @@ -28,7 +28,8 @@ Author : poussin --%> -<%@page import="org.nuiton.wikitty.publication.action.PublicationActionView"%> +<%@page + import="org.nuiton.wikitty.publication.action.PublicationActionView"%> <%@page import="org.nuiton.util.StringUtil"%> <%@page import="org.nuiton.wikitty.search.Criteria"%> <%@page import="org.nuiton.wikitty.search.Search"%> @@ -47,38 +48,41 @@ WikittyPublicationSession wpSession = WikittyPublicationSession .getWikittyPublicationSession(session); + PublicationActionView action = PublicationActionView + .getAction(); + out.println(action.getPagedResult().size()); + /* + WikittyPublicationContext context = (WikittyPublicationContext) request + .getAttribute(ActionEval.CONTEXT_VAR); + PagedResult<Wikitty> pagedResult = (PagedResult<Wikitty>) request + .getAttribute("pagedResult"); + Wikitty wikitty = (Wikitty) request + .getAttribute(ActionEval.WIKITTY_VAR); -PublicationActionView action = PublicationActionView.getAction(); + ActionEdit actionEdit = context.getAction(ActionEdit.class); + */ + Wikitty wikit = action.getWikittyResult(); +%> +<% +if (wikit!=null){ + out.print(wikit); +} -out.println( action.getPagedResult().size()); - -/* - 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); - */ - - %> -<form action="view" method="post"> +<form action="view.action" method="post"> <div> <textarea name="r" rows="4" cols="20"><%=action.getArgument("r", "*")%></textarea> </div> <label for="first">First</label> <input type="text" name="first" value="<%=action.getArgument("first", "0")%>" /> <label for="first">First</label> <input type="text" name="end" - value="<%=action.getArgument("end", "100")%>" /> <input - type="submit" name="id" value="Search" /> + value="<%=action.getArgument("end", "100")%>" /> <input type="submit" + name="id" value="Search" /> <pre> </pre> @@ -88,10 +92,8 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><a ">edit</a> - </td> - <td><input type="submit" name="id" value="<%=w.getId()%>" /> - </td> + <td><a">edit</a></td> + <td><input type="submit" name="id" value="<%=w.getId()%>" /></td> <td><%=w.getExtensionNames()%></td> </tr> <%

1 0

r878 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org May 9, 2011

May 9, 2011

Author: sletellier Date: 2011-05-09 16:21:16 +0200 (Mon, 09 May 2011) New Revision: 878 Url: http://nuiton.org/repositories/revision/wikitty/878 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> <modules> @@ -379,10 +379,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.1 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1.1</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-api/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-dto/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-generators/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-hessian-client/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-hessian-server/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-jdbc/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-perf-test/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-05-09 14:21:14 UTC (rev 877) +++ trunk/wikitty-solr/pom.xml 2011-05-09 14:21:16 UTC (rev 878) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1</version> + <version>3.1.2-SNAPSHOT</version> </parent>

1 0

r877 - in tags: . wikitty-3.1.1
by sletellier＠users.nuiton.org May 9, 2011

May 9, 2011

Author: sletellier Date: 2011-05-09 16:21:14 +0200 (Mon, 09 May 2011) New Revision: 877 Url: http://nuiton.org/repositories/revision/wikitty/877 Log: [maven-release-plugin] copy for tag wikitty-3.1.1 Added: tags/wikitty-3.1.1/ Property changes on: tags/wikitty-3.1.1 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r876 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org May 9, 2011

May 9, 2011

Author: sletellier Date: 2011-05-09 16:21:12 +0200 (Mon, 09 May 2011) New Revision: 876 Url: http://nuiton.org/repositories/revision/wikitty/876 Log: [maven-release-plugin] prepare release wikitty-3.1.1 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> <modules> @@ -379,10 +379,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1.1</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-api/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-dto/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-generators/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-hessian-client/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-hessian-server/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-jdbc/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-perf-test/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-05-09 14:14:54 UTC (rev 875) +++ trunk/wikitty-solr/pom.xml 2011-05-09 14:21:12 UTC (rev 876) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.1-SNAPSHOT</version> + <version>3.1.1</version> </parent>

1 0

r875 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/test/java/org/nuiton/wikitty/search wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc wikitty-publication/src/main/java/org/nuiton/wikitty/publication wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro wikitty-publication/src/main/resources wikitty-publication/src/main
by sletellier＠users.nuiton.org May 9, 2011

May 9, 2011

Author: sletellier Date: 2011-05-09 16:14:54 +0200 (Mon, 09 May 2011) New Revision: 875 Url: http://nuiton.org/repositories/revision/wikitty/875 Log: Fix svn:keywords Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicCountComparator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicNameComparator.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyManagedDataSource.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionLogin.java 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/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java 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/java/org/nuiton/wikitty/publication/action/PublicationContext.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java trunk/wikitty-publication/src/main/resources/struts.properties trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication/src/main/webapp/index.jsp trunk/wikitty-publication/src/site/rst/site-publication.rst trunk/wikitty-publication/src/site/rst/sync.rst trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicCountComparator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicNameComparator.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyManagedDataSource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/ActionLogin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConfig.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationSession.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionRaw.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/resources/struts.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF/decorators.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/main/webapp/index.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rst/site-publication.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-publication/src/site/rst/sync.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r874 - in trunk: wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by sletellier＠users.nuiton.org May 9, 2011

May 9, 2011

Author: sletellier Date: 2011-05-09 16:14:08 +0200 (Mon, 09 May 2011) New Revision: 874 Url: http://nuiton.org/repositories/revision/wikitty/874 Log: - Update headers - Renames tests Added: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java Removed: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch3Test.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyManagedDataSource.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-05-09 14:13:11 UTC (rev 873) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-05-09 14:14:08 UTC (rev 874) @@ -364,7 +364,7 @@ public static boolean tableExist(Connection connection, String tableName) throws SQLException { - // In postgres, tablenames are in lower case, in H2, is in upper case, so we test both + // In Postgres, tablenames are in lower case, in H2, are in upper case, so we test both DatabaseMetaData metaData = connection.getMetaData(); boolean existInLowerCase = metaData.getTables(null, null, tableName, null).next(); @@ -378,7 +378,8 @@ ResultSet typeInfo = connection.getMetaData().getTypeInfo(); while (typeInfo.next()) { String type = typeInfo.getString("TYPE_NAME"); - if (ArrayUtils.contains(BINARY_TYPES, type)) { + // In Postgres, types are in lower case, in H2, are in upper case, so we test both + if (ArrayUtils.contains(BINARY_TYPES, type.toLowerCase())) { return type; } } Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyManagedDataSource.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyManagedDataSource.java 2011-05-09 14:13:11 UTC (rev 873) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyManagedDataSource.java 2011-05-09 14:14:08 UTC (rev 874) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: wikitty-jdbc + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * 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% + */ package org.nuiton.wikitty.jdbc; import java.sql.Connection; Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-05-09 14:13:11 UTC (rev 873) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java 2011-05-09 14:14:08 UTC (rev 874) @@ -1,59 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2011 CodeLutin - * %% - * 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% - */ -package org.nuiton.wikitty.storage.solr; - -import org.junit.BeforeClass; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.api.AbstractSearchTest; - -/** - * User: couteau - * Date: 06/04/11 - */ -public class SolrSearch2Test extends AbstractSearchTest { - - WikittyService service; - - static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); - - @BeforeClass - public static void initTests() { - SolrTestHelper.initTests(config); - } - - @Override - public WikittyService getWikittyService() { - - if (service == null) { - service = new WikittyServiceSolr(config); - } - - service.clear(null); - - return service; - } -} \ No newline at end of file Deleted: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch3Test.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch3Test.java 2011-05-09 14:13:11 UTC (rev 873) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch3Test.java 2011-05-09 14:14:08 UTC (rev 874) @@ -1,34 +0,0 @@ -package org.nuiton.wikitty.storage.solr; - -import org.junit.BeforeClass; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.api.AbstractSearchTest; - -/** - * @author sletellier - */ -public class SolrSearch3Test extends AbstractSearchTest { - - WikittyService service; - - static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-server.properties"); - - @BeforeClass - public static void initTests() { - SolrTestHelper.initTests(config); - } - - @Override - public WikittyService getWikittyService() { - - if (service == null) { - service = new WikittyServiceSolr(config); - } - - service.clear(null); - - return service; - } -} \ No newline at end of file Copied: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java (from rev 871, trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch2Test.java) =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java (rev 0) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java 2011-05-09 14:14:08 UTC (rev 874) @@ -0,0 +1,59 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.wikitty.storage.solr; + +import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.api.AbstractSearchTest; + +/** + * User: couteau + * Date: 06/04/11 + */ +public class SolrSearchInMemoryTest extends AbstractSearchTest { + + WikittyService service; + + static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-inmemory.properties"); + + @BeforeClass + public static void initTests() { + SolrTestHelper.initTests(config); + } + + @Override + public WikittyService getWikittyService() { + + if (service == null) { + service = new WikittyServiceSolr(config); + } + + service.clear(null); + + return service; + } +} \ No newline at end of file Property changes on: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchInMemoryTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java (from rev 871, trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearch3Test.java) =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java (rev 0) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchServerTest.java 2011-05-09 14:14:08 UTC (rev 874) @@ -0,0 +1,58 @@ +/* + * #%L + * Wikitty :: wikitty-solr + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * 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% + */ +package org.nuiton.wikitty.storage.solr; + +import org.junit.BeforeClass; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.api.AbstractSearchTest; + +/** + * @author sletellier + */ +public class SolrSearchServerTest extends AbstractSearchTest { + + WikittyService service; + + static protected ApplicationConfig config = WikittyConfig.getConfig("wikitty-config-sample-server.properties"); + + @BeforeClass + public static void initTests() { + SolrTestHelper.initTests(config); + } + + @Override + public WikittyService getWikittyService() { + + if (service == null) { + service = new WikittyServiceSolr(config); + } + + service.clear(null); + + return service; + } +} \ No newline at end of file

1 0

r873 - in trunk: . wikitty-jdbc
by sletellier＠users.nuiton.org May 9, 2011

May 9, 2011

Author: sletellier Date: 2011-05-09 16:13:11 +0200 (Mon, 09 May 2011) New Revision: 873 Url: http://nuiton.org/repositories/revision/wikitty/873 Log: - Use mavenPom commons dependencies - Fix analyseDependencies Modified: trunk/pom.xml trunk/wikitty-jdbc/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-09 14:10:57 UTC (rev 872) +++ trunk/pom.xml 2011-05-09 14:13:11 UTC (rev 873) @@ -90,7 +90,8 @@ <scope>compile</scope> </dependency> - <dependency> +  +  + + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + <version>1.5.4</version> </dependency> <dependency> @@ -213,6 +220,7 @@ <version>4.9.0.GA</version> <scope>compile</scope> </dependency> + <dependency> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-05-09 14:10:57 UTC (rev 872) +++ trunk/wikitty-jdbc/pom.xml 2011-05-09 14:13:11 UTC (rev 873) @@ -76,11 +76,6 @@ </dependency> <dependency> - <groupId>jboss.jbossts</groupId> - <artifactId>jbossjta</artifactId> - </dependency> - - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> @@ -95,7 +90,17 @@ <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> - + + <dependency> + <groupId>commons-pool</groupId> + <artifactId>commons-pool</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + </dependencies>

1 0

r872 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action
by mfortun＠users.nuiton.org May 9, 2011

May 9, 2011

Author: mfortun Date: 2011-05-09 16:10:57 +0200 (Mon, 09 May 2011) New Revision: 872 Url: http://nuiton.org/repositories/revision/wikitty/872 Log: * correct todo * remove unused import Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-05-09 14:07:29 UTC (rev 871) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEval.java 2011-05-09 14:10:57 UTC (rev 872) @@ -2,36 +2,27 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import java.io.ObjectOutputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; - import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.struts2.interceptor.ServletRequestAware; import org.apache.struts2.interceptor.ServletResponseAware; import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.ObjectUtil; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.ScriptEvaluator; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.publication.AbstractActionOnWikitty; -import org.nuiton.wikitty.publication.WikittyPublicationAction; import org.nuiton.wikitty.publication.WikittyPublicationConfig; -import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.publication.entities.WikittyPubText; import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.search.Criteria; - import com.opensymphony.xwork2.ActionContext; public class PublicationActionEval extends PublicationBaseAction implements @@ -203,7 +194,7 @@ @Override public String getActionName() { - // TODO mfortun + // TODO mfortun-2011-05-09 really needed ? throw new UnsupportedOperationException("not yet implemented"); // return null; @@ -236,7 +227,7 @@ @Override public List<String> getMandatoryArguments() { - // TODO mfortun + // TODO mfortun-2011-05-09 really needed ? throw new UnsupportedOperationException("not yet implemented"); // return null; @@ -244,7 +235,7 @@ @Override public Map<String, String> getArguments() { - // TODO mfortun + // TODO mfortun-2011-05-09 really needed ? throw new UnsupportedOperationException("not yet implemented"); // return null; @@ -252,7 +243,7 @@ @Override public Map<String, byte[]> getArgumentFiles() { - // TODO mfortun + // TODO mfortun-2011-05-09 really needed ? throw new UnsupportedOperationException("not yet implemented"); // return null; 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-09 14:07:29 UTC (rev 871) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-09 14:10:57 UTC (rev 872) @@ -2,21 +2,13 @@ import java.util.List; import java.util.Map; - import org.apache.struts2.interceptor.SessionAware; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; - import org.nuiton.wikitty.publication.WikittyPublicationProxy; import org.nuiton.wikitty.publication.WikittyPublicationSession; import org.nuiton.wikitty.publication.entities.WikittyPubData; -import org.nuiton.wikitty.publication.entities.WikittyPubDataHelper; import org.nuiton.wikitty.publication.entities.WikittyPubText; -import org.nuiton.wikitty.publication.entities.WikittyPubTextHelper; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.Search; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionSupport; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-05-09 14:07:29 UTC (rev 871) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationContext.java 2011-05-09 14:10:57 UTC (rev 872) @@ -9,8 +9,8 @@ import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyService; -import org.nuiton.wikitty.publication.WikittyPublicationAction; + public interface PublicationContext {

1 0