[Wikitty-commits] r866 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/action resources webapp webapp/WEB-INF webapp/WEB-INF/jsp

6 May 2011

Author: mfortun
Date: 2011-05-06 17:59:36 +0200 (Fri, 06 May 2011)
New Revision: 866

Url: http://nuiton.org/repositories/revision/wikitty/866

Log:
* little change in packaging
* View action basically implemented, it only list all the wikitty


Added:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/
   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
Removed:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java
Modified:
   trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java
   trunk/wikitty-publication/src/main/resources/struts.xml
   trunk/wikitty-publication/src/main/webapp/WEB-INF/
   trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp
   trunk/wikitty-publication/src/main/webapp/index.jsp

Deleted: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java
===================================================================

--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java	2011-05-06 10:17:02 UTC (rev 865)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java	2011-05-06 15:59:36 UTC (rev 866)
@@ -1,38 +0,0 @@
-package org.nuiton.wikitty.publication;
-
-import java.util.Map;
-
-import org.apache.struts2.interceptor.SessionAware;
-
-import com.opensymphony.xwork2.ActionSupport;
-
-
-/**
- * Base action that wikitty publication will extend, needed to work within
- * a struts architecture.
- * 
- * @author mfortun
- *
- */
-public class BaseAction extends ActionSupport implements SessionAware {
-
-    /**
-     * 
-     */
-    private static final long serialVersionUID = 1865905051843413141L;
-
-    @Override
-    public void setSession(Map<String, Object> arg0) {
-        // TODO mfortun
-        throw new UnsupportedOperationException("not yet implemented");
-        //
-
-    }
-    
-    
-    public WikittyPublicationProxy getPublicationProxy(){
-        //TODO mfortun-2011-05-05 
-        return null;
-    }
-
-}

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-06 10:17:02 UTC (rev 865)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java	2011-05-06 15:59:36 UTC (rev 866)
@@ -1,5 +1,7 @@
 package org.nuiton.wikitty.publication;
 
+import java.io.Serializable;
+
 import org.nuiton.util.ApplicationConfig;
 import org.nuiton.wikitty.WikittyProxy;
 import org.nuiton.wikitty.WikittyService;

Added: 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	                        (rev 0)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java	2011-05-06 15:59:36 UTC (rev 866)
@@ -0,0 +1,66 @@
+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 com.opensymphony.xwork2.ActionContext;
+
+public class PublicationActionView extends PublicationBaseAction {
+
+    protected PagedResult<Wikitty> pagedResult;
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = -4927699544115089591L;
+
+    static public PublicationActionView getAction() {
+        return (PublicationActionView) ActionContext.getContext().get(
+                CONTEXT_ACTION_KEY);
+    }
+
+    @Override
+    public String execute() throws Exception {
+
+        System.out.println("ponay");
+
+        System.out.println(ActionContext.getContext().getParameters());
+
+        SearchForAllWikitty();
+        
+        return SUCCESS;
+    }
+
+    protected void SearchForAllWikitty() {
+
+        String r = "*";
+
+        int firstIndex = 0;
+        int endIndex = 100;
+
+        Criteria criteria = Search.query().keyword(r).criteria();
+        criteria.setFirstIndex(firstIndex);
+        criteria.setEndIndex(endIndex);
+
+        pagedResult = getWikittyPublicationProxy().findAllByCriteria(criteria);
+
+    }
+
+    public PagedResult<Wikitty> getPagedResult() {
+        return pagedResult;
+    }
+
+    public void setPagedResult(PagedResult<Wikitty> pagedResult) {
+        this.pagedResult = pagedResult;
+    }
+
+    
+    public String getArgument(String key, String defaultValue){
+        
+        
+        return defaultValue;
+    }
+    
+}


Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain

Copied: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java (from rev 862, trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java)
===================================================================
--- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java	                        (rev 0)
+++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java	2011-05-06 15:59:36 UTC (rev 866)
@@ -0,0 +1,46 @@
+package org.nuiton.wikitty.publication.action;
+
+import java.util.Map;
+
+import org.apache.struts2.interceptor.SessionAware;
+import org.nuiton.wikitty.publication.WikittyPublicationProxy;
+import org.nuiton.wikitty.publication.WikittyPublicationSession;
+
+import com.opensymphony.xwork2.ActionSupport;
+
+/**
+ * Base action that wikitty publication will extend, needed to work within a
+ * struts architecture.
+ * 
+ * @author mfortun
+ * 
+ */
+public class PublicationBaseAction extends ActionSupport implements SessionAware {
+
+    /**
+     * 
+     */
+    private static final long serialVersionUID = 1865905051843413141L;
+
+    final static protected String CONTEXT_ACTION_KEY = "action";
+
+    protected Map<String, Object> session;
+
+    public WikittyPublicationSession getWikittyPublicationSession() {
+        WikittyPublicationSession result = WikittyPublicationSession
+                .getWikittyPublicationSession(session);
+        return result;
+    }
+
+    public WikittyPublicationProxy getWikittyPublicationProxy() {
+        WikittyPublicationProxy result = getWikittyPublicationSession()
+                .getProxy();
+        return result;
+    }
+
+    @Override
+    public void setSession(Map<String, Object> sess) {
+        this.session = sess;
+    }
+
+}


Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.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-05-06 10:17:02 UTC (rev 865)
+++ trunk/wikitty-publication/src/main/resources/struts.xml	2011-05-06 15:59:36 UTC (rev 866)
@@ -17,8 +17,10 @@
 
 			<result>/WEB-INF/jsp/edit.jsp</result>
 		</action>
-		<action name="viewPage">
+		<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>
 
@@ -26,6 +28,8 @@
 	
 	
 
+
+
 <!--
 
 	<package name="wikitty-publication" namespace="/" extends="struts-default">


Property changes on: trunk/wikitty-publication/src/main/webapp/WEB-INF
___________________________________________________________________
Added: svn:ignore
   + tempo


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-06 10:17:02 UTC (rev 865)
+++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp	2011-05-06 15:59:36 UTC (rev 866)
@@ -28,49 +28,74 @@
     Author     : poussin
 --%>
 
+<%@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"%>
+<%@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.publication.WikittyPublicationContext"%>
 <%@page import="org.nuiton.wikitty.search.PagedResult"%>
 <%@page import="org.nuiton.wikitty.entities.Wikitty"%>
 
 <h1>Wikitty View</h1>
 
 <%
-WikittyPublicationContext context = (WikittyPublicationContext)
-        request.getAttribute(ActionEval.CONTEXT_VAR);
-PagedResult<Wikitty> pagedResult = (PagedResult<Wikitty>)request.getAttribute("pagedResult");
-Wikitty wikitty = (Wikitty)request.getAttribute(ActionEval.WIKITTY_VAR);
+    WikittyPublicationSession wpSession = WikittyPublicationSession
+                .getWikittyPublicationSession(session);
 
-ActionEdit actionEdit = context.getAction(ActionEdit.class);
+
+
+
+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);
+
+        ActionEdit actionEdit = context.getAction(ActionEdit.class);
+        */
+        
+
 %>
 
-<form action="" method="post">
-    <div>
-        <textarea name="r" rows="4" cols="20"><%=context.getArgument("r", "*")%></textarea>
-    </div>
-        <label for="first">First</label> <input type="text" name="first" value="<%=context.getArgument("first", "0")%>" />
-    <label for="first">First</label> <input type="text" name="end" value="<%=context.getArgument("end", "100")%>" />
-    <input type="submit" name="id" value="Search"/>
+<form action="view" 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" />
+	<pre>
 
-<pre>
-<%=wikitty%>
 </pre>
 
-    <%=pagedResult.getFirstIndice()%>-<%=pagedResult.getFirstIndice() + pagedResult.size()%>/${pagedResult.numFound}
-    <table>
-        <%
-        
-        for (Wikitty w : pagedResult.getAll()) {
-        %>
-        <tr>
-            <td><a href="<%=actionEdit.makeUrl(context, w)%>">edit</a></td>
-            <td><input type="submit" name="id" value="<%=w.getId()%>"/></td>
-            <td><%=w.getExtensionNames()%></td>
-        </tr>
-        <%
-        }
-        %>
-    </table>
+	<table>
+		<%
+		    for (Wikitty w : action.getPagedResult().getAll()) {
+		%>
+		<tr>
+			<td><a ">edit</a>
+			</td>
+			<td><input type="submit" name="id" value="<%=w.getId()%>" />
+			</td>
+			<td><%=w.getExtensionNames()%></td>
+		</tr>
+		<%
+		    }
+		%>
+	</table>
 </form>
-    
\ No newline at end of file

Modified: trunk/wikitty-publication/src/main/webapp/index.jsp
===================================================================
--- trunk/wikitty-publication/src/main/webapp/index.jsp	2011-05-06 10:17:02 UTC (rev 865)
+++ trunk/wikitty-publication/src/main/webapp/index.jsp	2011-05-06 15:59:36 UTC (rev 866)
@@ -1,20 +1,29 @@
-<%@ taglib prefix="s" uri="/struts-tags" %>
 
-<% out.println("hello !");   %>
 
-     <s:url var="regenPermToken" action="viewPage"/>
-        <s:a href="%{regenPermToken}" id="regenPermToken">
-            <s:text name="view"/>
-        </s:a>
+<%@page
+	import="org.nuiton.wikitty.publication.WikittyPublicationSession"%>
+<%@ taglib prefix="s" uri="/struts-tags"%>
 
+<%
+    out.println("hello !");
 
-<s:url var="regenPermToken" action="editPage"/>
-        <s:a href="%{regenPermToken}" id="regenPermToken">
-            <s:text name="edit"/>
-        </s:a>
+    WikittyPublicationSession wpSession = WikittyPublicationSession
+            .getWikittyPublicationSession(session);
+%>
 
+<s:url var="regenPermToken" action="wiki/view" />
+<s:a href="%{regenPermToken}" id="regenPermToken">
+	<s:text name="view" />
+</s:a>
 
 
+<s:url var="regenPermToken" action="edit" />
+<s:a href="%{regenPermToken}" id="regenPermToken">
+	<s:text name="edit" />
+</s:a>
+
+
+
 <!-- 
      <s:url var="regenPermToken" action="regenPermToken"/>
         <s:a href="%{regenPermToken}" id="regenPermToken">

    

[Wikitty-commits] r866 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication java/org/nuiton/wikitty/publication/action resources webapp webapp/WEB-INF webapp/WEB-INF/jsp

mfortun＠users.nuiton.org