Author: tchemit Date: 2012-02-22 23:21:35 +0100 (Wed, 22 Feb 2012) New Revision: 3139 Url: http://chorem.org/repositories/revision/pollen/3139 Log: remove all struts parts of the tapestry module Removed: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/ Deleted: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-02-22 14:25:23 UTC (rev 3138) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-02-22 22:21:35 UTC (rev 3139) @@ -1,31 +0,0 @@ -package org.chorem.pollen.ui; - -import java.util.Map; - -import com.opensymphony.xwork2.ActionContext; - -/** - * Class used to manage the session - */ -public class PollenSession { - - static final private String POLLEN_SESSION_KEY = PollenSession.class.getSimpleName(); - - static public Map<String, Object> getSession() { - return ActionContext.getContext().getSession(); - } - - static public PollenSession getPollenSession() { - PollenSession session = (PollenSession) getSession().get(POLLEN_SESSION_KEY); - - if (session == null) { - session = new PollenSession(); - getSession().put(POLLEN_SESSION_KEY, session); - } - return session; - } - - static public void invalidate() { - getSession().remove(POLLEN_SESSION_KEY); - } -} Deleted: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties 2012-02-22 14:25:23 UTC (rev 3138) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties 2012-02-22 22:21:35 UTC (rev 3139) @@ -1,51 +0,0 @@ -struts.locale=fr_FR -struts.i18n.encoding=UTF-8 - -struts.objectFactory = spring - -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=bow-i18n - -struts.dispatcher.parametersWorkaround = false - -#struts.freemarker.manager.classname=org.apache.struts2.views.freemarker.FreemarkerManager - -struts.freemarker.wrapper.altMap=true - -struts.xslt.nocache=false Deleted: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml 2012-02-22 14:25:23 UTC (rev 3138) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml 2012-02-22 22:21:35 UTC (rev 3139) @@ -1,90 +0,0 @@ -<?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" /> - - <package name="default" extends="struts-default"> - <interceptors> - <interceptor name="login" - class="org.chorem.pollen.ui.interceptor.LoginInterceptor"> - <param name="redirect">login_input.action</param> - </interceptor> - <interceptor-stack name="loginStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="defaultStack" /> - </interceptor-stack> - </interceptors> - <action name="login" - class="org.chorem.pollen.ui.action.user.LoginUserAction" - method="login"> - </action> - <action name="logout" - class="org.chorem.pollen.ui.action.user.LoginUserAction" - method="logout"> - <result type="redirect">/jsp/index.jsp</result> - </action> - <action name="register" - class="org.chorem.pollen.ui.action.user.RegisterAction"> - <result type="redirect">/jsp/index.jsp</result> - </action> - <action name="pollsParticipated" - class="org.chorem.pollen.ui.action.poll.PollsListAction" - method="listPollsParticipated"> - <interceptor-ref name="loginStack" /> - </action> - <action name="pollsCreated" - class="org.chorem.pollen.ui.action.poll.PollsListAction" - method="listPollsCreated"> - <interceptor-ref name="loginStack" /> - </action> - <action name="userProfile" - class="org.chorem.pollen.ui.action.user.UserProfileAction"> - <interceptor-ref name="loginStack" /> - </action> - <action name="createVotersList" - class="org.chorem.pollen.ui.action.poll.VotersListAction" - method="create"> - <interceptor-ref name="loginStack" /> - </action> - <action name="modifyVotersList" - class="org.chorem.pollen.ui.action.poll.VotersListAction" - method="modify"> - <interceptor-ref name="loginStack" /> - </action> - <action name="deleteVotersList" - class="org.chorem.pollen.ui.action.poll.VotersListAction" - method="delete"> - <interceptor-ref name="loginStack" /> - </action> - <action name="voteFor" - class="org.chorem.pollen.ui.action.poll.VoteForAction"> - </action> - <action name="createPoll" - class="org.chorem.pollen.ui.action.poll.PollAction" - method="create"> - </action> - <action name="modifyPoll" - class="org.chorem.pollen.ui.action.poll.PollAction" - method="modify"> - </action> - <action name="copyPoll" - class="org.chorem.pollen.ui.action.poll.PollAction" - method="copy"> - </action> - <action name="closePoll" - class="org.chorem.pollen.ui.action.poll.PollAction" - method="close"> - </action> - <action name="deletePoll" - class="org.chorem.pollen.ui.action.poll.PollAction" - method="delete"> - </action> - <action name="exportPollXML" - class="org.chorem.pollen.ui.action.poll.PollAction" - method="exportXML"> - </action> - </package> -</struts>