Author: mfortun Date: 2011-09-01 19:05:35 +0200 (Thu, 01 Sep 2011) New Revision: 1226 Url: http://nuiton.org/repositories/revision/wikitty/1226 Log: Correct struts migration, mandatory args handled directly by struts Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -111,7 +111,7 @@ doAction(); - putIdArgs(wikitty.getId()); + args = Element.ELT_ID + ":" + wikitty.getId(); return SUCCESS; } @@ -134,8 +134,6 @@ } else { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters() - .get(ARGS_KEY).toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); @@ -325,7 +323,7 @@ public String getPostUrl() { - return getArgument(ARGS_KEY, "") + ".action"; + return args + ".action"; } protected Map<String, Object> formatArgs(Map<String, Object> args) { @@ -367,12 +365,9 @@ return wikittyFieldMap; } - protected void putIdArgs(String id) { - ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + id); - } + public String getMimeType (){ if (wikitty.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)){ return WikittyPubTextHelper.getMimeType(wikitty); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -536,7 +536,7 @@ // TODO mforun-2011-05-09 rework on this method finalUrl = getRequest().getContextPath() + "/" - + getArgument(CONTEXT_DATA_KEY, "") + finalUrl; + + contextData + finalUrl; finalUrl = getResponse().encodeURL(finalUrl) + ".action"; if (log.isInfoEnabled()) { log.info(String.format("transforme url from '%s' to '%s'", url, @@ -554,8 +554,7 @@ @Override public List<String> getMandatoryArguments() { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); + String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -94,7 +94,7 @@ if (password != null) { String md5 = StringUtil.encodeMD5(password); - getWikittyPublicationSession().login(getContextArgs(), login, + getWikittyPublicationSession().login(contextData, login, md5); result = SUCCESS; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -69,8 +69,6 @@ public String execute() throws Exception { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -142,9 +142,6 @@ @Override public String execute() throws Exception { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); - String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -62,17 +62,24 @@ final static protected String CONTEXT_ACTION_KEY = "action"; static public String SEPARATOR = "/"; - static public String CONTEXT_DATA_KEY = "contextData"; - static public String CONTEXT_APPS_KEY = "contextApps"; - static public String ARGS_KEY = "args"; + protected Map<String, Object> session; protected String contextData; protected String contextApps; + protected String args; + public String getArgs() { + return args; + } + + public void setArgs(String args) { + this.args = args; + } + public String getContextApps() { return contextApps; } @@ -93,13 +100,13 @@ public WikittyPublicationSession getWikittyPublicationSession() { WikittyPublicationSession result = WikittyPublicationSession - .getWikittyPublicationSession(session, getContextArgs()); + .getWikittyPublicationSession(session, contextData); return result; } public WikittyPublicationProxy getWikittyPublicationProxy() { WikittyPublicationProxy result = getWikittyPublicationSession() - .getProxy(getContextArgs()); + .getProxy(contextData); return result; } @@ -194,14 +201,6 @@ return result; } - public String getContextArgs() { - return (String) ActionContext.getContext().getParameters() - .get(CONTEXT_DATA_KEY); - } - public String getArgs() { - return (String) ActionContext.getContext().getParameters() - .get(ARGS_KEY); - } } Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-09-01 17:05:35 UTC (rev 1226) @@ -75,7 +75,7 @@ <h1>Edit <%=wikitty.getId()%></h1> <p> - <s:set var="localContext"><%=action.getContextArgs()%></s:set> + <s:set var="localContext"><%=action.getContextData()%></s:set> <s:url var="urledit" action="%{#localContext}/view/" /> <a href="${urledit}">View</a> <s:url var="urledit" action="%{#localContext}/edit/" /> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-09-01 17:05:35 UTC (rev 1226) @@ -69,8 +69,8 @@ %> <p> - <s:set var="localContext"><%=action.getContextArgs()%></s:set><s:url - var="urledit" action="%{#localContext}/edit/" /> + <s:set var="contextData"><%=action.getContextData()%></s:set> <s:url + var="urledit" action="%{#contextData}/edit/" /> <a href="${urledit}">New wikitty</a> </p> @@ -113,30 +113,28 @@ 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}" /> - <s:set - var="contextData"><%=action.getContextData()%></s:set> - + <td> + + + <s:set var="wid"><%=w.getId()%></s:set> + <s:url var="urledit" action="%{#contextData}/edit/elt_id:%{#wid}" /> + <a href="${urledit}">Edit</a> <s:url var="urlraw" + action="%{#contextData}/raw/elt_id:%{#wid}" /> <s:url var="urlFragment" action="%{#contextData}/wikittyInfo" namespace="/fragment"> - <s:param name="id"><%=w.getId()%></s:param> + </s:url> <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a> <% - if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT) - || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { - %> + if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT) + || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + %> <a href="${urlraw}">Raw</a> <s:url var="urleval" - action="%{#localContext}/eval/elt_id:%{#wid}" /> <a + action="%{#contextData}/eval/elt_id:%{#wid}" /> <a href="${urleval}">Eval</a> - <!-- <a id="ajaxlink_<%=i%>" href="javascript:void(0)">View</a> --> <% } %>