Author: mfortun Date: 2011-05-05 18:08:19 +0200 (Thu, 05 May 2011) New Revision: 862 Url: http://nuiton.org/repositories/revision/wikitty/862 Log: * continue migration to struts Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java trunk/wikitty-publication/src/main/resources/struts.properties trunk/wikitty-publication/src/main/resources/struts.xml Modified: trunk/wikitty-publication/src/main/webapp/index.jsp Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java 2011-05-05 16:08:19 UTC (rev 862) @@ -0,0 +1,38 @@ +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; + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/BaseAction.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java 2011-05-05 16:08:19 UTC (rev 862) @@ -0,0 +1,15 @@ +package org.nuiton.wikitty.publication; + +import org.nuiton.wikitty.WikittyProxy; + +/** + * Proxy use by action in wikitty publication + * + * @author mfortun + * + */ +public class WikittyPublicationProxy extends WikittyProxy{ + + + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationProxy.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/resources/struts.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.properties (rev 0) +++ trunk/wikitty-publication/src/main/resources/struts.properties 2011-05-05 16:08:19 UTC (rev 862) @@ -0,0 +1,50 @@ +struts.locale=fr_FR +struts.i18n.encoding=UTF-8 + + +struts.objectFactory.spring.autoWire=name + +struts.objectFactory.spring.useClassCache=true + +# struts.multipart.parser=cos +# struts.multipart.parser=pell +struts.multipart.parser=jakarta +# uses javax.servlet.context.tempdir by default +struts.multipart.saveDir= +struts.multipart.maxSize=2097152 + +# struts.custom.properties=application,com/webwork/extension/custom + +struts.mapper.class=org.apache.struts2.dispatcher.mapper.DefaultActionMapper + +struts.action.extension=action + +struts.serve.static=true + +struts.serve.static.browserCache=true + +struts.tag.altSyntax=true + +struts.devMode=true + +struts.i18n.reload=true + +struts.ui.theme=xhtml +struts.ui.templateDir=template +#sets the default template type. Either ftl, vm, or jsp +struts.ui.templateSuffix=ftl + +struts.configuration.xml.reload=false + +struts.url.http.port=80 +struts.url.https.port=443 + +struts.custom.i18n.resources=chorem-i18n + +struts.dispatcher.parametersWorkaround=false + +#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager + +struts.freemarker.wrapper.altMap=true + +struts.xslt.nocache=false Property changes on: trunk/wikitty-publication/src/main/resources/struts.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml (rev 0) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-05 16:08:19 UTC (rev 862) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.0.dtd"> +<struts> + + + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + <constant name="struts.enable.SlashesInActionNames" value="true" /> + + + + <package name="test" extends="struts-default"> + + <action name="editPage"> + + <result>/WEB-INF/jsp/edit.jsp</result> + </action> + <action name="viewPage"> + + <result>/WEB-INF/jsp/view.jsp</result> + </action> + + </package> + + + +<!-- + + <package name="wikitty-publication" namespace="/" extends="struts-default"> + <default-action-ref name="home" /> + <action name="*/action/*" class="org.nuiton.nospamweb.action.CheckAction"> + <param name="context">{1}</param> + <param name="args">{1}</param> + <result name="input">WEB-INF/jsp/captcha.jsp</result> + <result name="success" type="redirect">${redirectTo}</result> + </action> + </package> + + code base for action +<action name="*/action/*" class="org.nuiton.nospamweb.action.CheckAction"> + <param name="context">{1}</param> + <param name="args">{1}</param> + <result name="input">WEB-INF/jsp/captcha.jsp</result> + <result name="success" type="redirect">${redirectTo}</result> + </action> +--> + +</struts> Property changes on: trunk/wikitty-publication/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/wikitty-publication/src/main/webapp/index.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/index.jsp 2011-05-05 16:08:09 UTC (rev 861) +++ trunk/wikitty-publication/src/main/webapp/index.jsp 2011-05-05 16:08:19 UTC (rev 862) @@ -1 +1,32 @@ -<% out.println("hello !"); %> \ No newline at end of file +<%@ 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> + + +<s:url var="regenPermToken" action="editPage"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="edit"/> + </s:a> + + + +<!-- + <s:url var="regenPermToken" action="regenPermToken"/> + <s:a href="%{regenPermToken}" id="regenPermToken"> + <s:text name="bow.preferences.regenPermToken"/> + </s:a> +(17:06:03) blabla@conference.im.codelutin.com/sletellier: + <s:url var="homeToken" action="home"> + <s:param name="token"><s:property value="%{#session.BowSession.getPermanentToken()}" /></s:param> + </s:url> + + + + --> + +