- Pollen-commits - mailman.cloud.codelutin.com

r3205 - in branches/pollen-1.2.6-struts2: pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by fdesbois＠users.chorem.org March 23, 2012

March 23, 2012

Author: fdesbois Date: 2012-03-23 18:15:58 +0100 (Fri, 23 Mar 2012) New Revision: 3205 Url: http://chorem.org/repositories/revision/pollen/3205 Log: Create/Update Vote with VoteToChoice management Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-03-23 17:15:58 UTC (rev 3205) @@ -69,7 +69,7 @@ public <E extends TopiaEntity> E getEntityById(Class<E> entityType, String id) { Preconditions.checkNotNull(entityType); - Preconditions.checkArgument(StringUtils.isNotEmpty(id)); + Preconditions.checkArgument(StringUtils.isNotEmpty(id), "The " + entityType.getSimpleName() + " id is undefined"); try { TopiaDAO<E> dao = getDAO(entityType); E result = dao.findByTopiaId(id); Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-23 17:15:58 UTC (rev 3205) @@ -385,12 +385,14 @@ public PollAccount getNewPollAccount(UserAccount userAccount) { PollAccountDAO dao = getDAO(PollAccount.class); PollAccount result = newInstance(dao); + result.setAccountId(serviceContext.createPollenUrlId()); if (userAccount != null) { String displayName = userAccount.getDisplayName(); result.setVotingId(displayName); } else { result.setVotingId(""); } + result.setUserAccount(userAccount); return result; } @@ -600,6 +602,50 @@ return result; } + public void addVoteToPoll(Poll poll, Vote vote) { + + String pollId = poll.getTopiaId(); + String voteId = vote.getTopiaId(); + + Poll pollToUpdate = getEntityById(Poll.class, pollId); + Vote voteToAdd = getEntityById(Vote.class, voteId); + + pollToUpdate.addVote(voteToAdd); + + commitTransaction("Can't add the vote [" + voteId + "] to the poll [" + pollId + "]"); + + +// TopiaContext transaction = null; +// try { +// transaction = rootContext.beginTransaction(); +// +// pollDAO = PollenModelDAOHelper.getPollDAO(transaction); +// Poll pollEntity = pollDAO.findByTopiaId(pollId); +// VoteDAO voteDAO = PollenModelDAOHelper.getVoteDAO(transaction); +// Vote voteEntity = voteDAO.findByTopiaId(voteId); +// +// if (log.isDebugEnabled()) { +// log.debug(pollEntity + " " + voteEntity); +// } +// +// pollEntity.addVote(voteEntity); +// pollDAO.update(pollEntity); +// +// transaction.commitTransaction(); +// +// if (log.isDebugEnabled()) { +// log.debug("Entity updated: " + pollId); +// } +// +// return true; +// } catch (Exception e) { +// ContextUtil.doCatch(e, transaction); +// return false; +// } finally { +// ContextUtil.doFinally(transaction); +// } + } + /** * Création d'une miniature. * Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-03-23 17:15:58 UTC (rev 3205) @@ -23,15 +23,22 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Preconditions; +import com.google.common.base.Predicate; +import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.PollAccountDAO; +import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.Vote; import org.chorem.pollen.business.persistence.VoteDAO; +import org.chorem.pollen.business.persistence.VoteToChoice; +import org.chorem.pollen.business.persistence.VoteToChoiceDAO; import org.chorem.pollen.entities.PollenDAOHelper; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.VoteNotFoundException; @@ -46,68 +53,137 @@ /** Logger. */ private static final Log log = LogFactory.getLog(VoteService.class); + + public Vote getNewVote(Poll poll, PollAccount account) { + + Preconditions.checkNotNull(poll); + + VoteDAO voteDAO = getDAO(Vote.class); + VoteToChoiceDAO voteToChoiceDAO = getDAO(VoteToChoice.class); + + Vote result = newInstance(voteDAO); + result.setPollAccount(account); + + // Prepare the List of VoteToChoice with Poll's choices + for (Choice choice : poll.getChoice()) { + VoteToChoice element = newInstance(voteToChoiceDAO); + element.setChoice(choice); + result.addChoiceVoteToChoice(element); + } - public void createVote(Vote vote, PollAccount pollAccount) { + // TODO weight ? + + return result; + } + + public Vote getVote(Poll poll, List<Vote> votes, final PollAccount account) { + + Preconditions.checkNotNull(poll); + Preconditions.checkNotNull(votes); + Preconditions.checkNotNull(account); - // création du compte associé au vote s'il n'existe pas - // sinon mise à jour du compte - //ServicePollAccount spa = new ServicePollAccountImpl(); - if (pollAccount == null) { - vote.setPollAccount(null); - } else { -// pollAccount.setHasVoted(true); - PollAccountDAO pollAccountDAO = - getDAO(PollAccount.class); + Vote result = Iterables.find(votes, new Predicate<Vote>() { + + @Override + public boolean apply(Vote input) { + return account.equals(input.getPollAccount()); + } - PollAccount pollAccountEntity = - getEntityById(PollAccount.class, pollAccount.getTopiaId()); + }, getNewVote(poll, account)); -// PollAccountDTO account = spa.findPollAccountById(pollAccountDTO -// .getId()); - if (pollAccountEntity == null) { - log.debug("Nouveau compte associé au vote"); - pollAccountEntity = create(pollAccountDAO); -// voteDTO.setPollAccountId(spa -// .createPollAccount(pollAccountDTO)); - } else { - log.debug("Compte associé au vote : " + pollAccountEntity.getTopiaId()); - //spa.updatePollAccount(pollAccountDTO); - //voteDTO.setPollAccountId(account.getId()); + // For an existing Vote, ensure that there is as many voteToChoice as poll choices + if (result.getTopiaId() != null) { + + VoteToChoiceDAO voteToChoiceDAO = getDAO(VoteToChoice.class); + + List<VoteToChoice> voteToChoices = result.getChoiceVoteToChoice(); + + // Add all VoteToChoice even they have empty value to match the size of Poll Choice List + List<Choice> choices = poll.getChoice(); + for (int i = 0; i < choices.size(); i++) { + + Choice choice = choices.get(i); + VoteToChoice voteToChoice = voteToChoices.get(i); + + // Add new VoteToChoice if choice doesn't match (not exists) + if (!voteToChoice.getChoice().equals(choice)) { + VoteToChoice element = newInstance(voteToChoiceDAO); + element.setChoice(choice); + voteToChoices.add(i, element); + } } - // Fill pollAccountEntity from DTO in argument -// DataPollAccountConverter pollAccountConverter = new DataPollAccountConverter(); -// pollAccountConverter.setTransaction(transaction); -// pollAccountConverter.populatePollAccountEntity(pollAccountDTO, -// pollAccountEntity); - // Update pollAccountEntity -// pollAccountDAO.update(pollAccountEntity); - - vote.setPollAccount(pollAccountEntity); -// vote.setVotingListId(pollAccount.getVotingListId()); -// vote.setWeight(pollAccount.getWeight()); - log.debug("Poids du vote : " + vote.getWeight()); + } + return result; + } + + public Vote createVote(Vote vote) { VoteDAO voteDAO = getDAO(Vote.class); + VoteToChoiceDAO voteToChoiceDAO = getDAO(VoteToChoice.class); - Vote voteEntity = create(voteDAO); -// converter.setTransaction(transaction); -// converter.populateVoteEntity(vote, voteEntity); + Vote result = create(voteDAO); + result.setWeight(vote.getWeight()); + result.setAnonymous(vote.isAnonymous()); -// converter.populateChoiceVote(vote, voteEntity); + // -- PollAccount -- // + PollAccount pollAccount = vote.getPollAccount(); + String pollAccountId = pollAccount.getTopiaId(); + PollAccount pollAccountLoaded = null; + // Load existing account only if not anonymous, otherwise a new pollAccount must be created + if (pollAccountId != null && !vote.isAnonymous()) { + pollAccountLoaded = getEntityById(PollAccount.class, pollAccountId); + } + // Create the new PollAccount + if (pollAccountLoaded == null) { + + PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); + pollAccountLoaded = create(pollAccountDAO); + pollAccountLoaded.setAccountId(pollAccount.getAccountId()); + } + + // Update user data if not anonymous + if (!vote.isAnonymous()) { + + pollAccountLoaded.setVotingId(pollAccount.getVotingId()); + pollAccountLoaded.setEmail(pollAccount.getEmail()); + + UserAccount userAccount = pollAccount.getUserAccount(); + if (userAccount != null) { + UserAccount userAccountLoaded = getEntityById(UserAccount.class, userAccount.getTopiaId()); + pollAccountLoaded.setUserAccount(userAccountLoaded); + } + } + result.setPollAccount(pollAccountLoaded); + + // -- List of VoteToChoice -- // + for (VoteToChoice input : vote.getChoiceVoteToChoice()) { + + Integer value = input.getVoteValue(); + if (value != null) { + + VoteToChoice voteToChoiceCreated = create(voteToChoiceDAO); + voteToChoiceCreated.setVoteValue(value); + + // Bind with existing Choice + String choiceId = input.getChoice().getTopiaId(); + Choice choiceLoaded = getEntityById(Choice.class, choiceId); + voteToChoiceCreated.setChoice(choiceLoaded); + + result.addChoiceVoteToChoice(voteToChoiceCreated); + } + } + if (log.isDebugEnabled()) { - log.debug("Entity created: " + voteEntity.getTopiaId()); + log.debug("Entity created: " + result.getTopiaId()); } commitTransaction("Could not create vote"); - // email notification - - // feed notification - + return result; } public void updateVote(Vote vote) throws VoteNotFoundException { @@ -117,9 +193,31 @@ if (entityToUpdate == null) { throw new VoteNotFoundException(); } -// converter.setTransaction(transaction); -// converter.populateVoteEntity(voteDTO, voteEntity); + VoteToChoiceDAO voteToChoiceDao = getDAO(VoteToChoice.class); + + for (VoteToChoice input : vote.getChoiceVoteToChoice()) { + + Integer value = input.getVoteValue(); + + VoteToChoice voteToChoiceEntity = entityToUpdate.getChoiceVoteToChoice(input.getChoice()); + if (value != null) { + + if (voteToChoiceEntity == null) { + voteToChoiceEntity = create(voteToChoiceDao); + voteToChoiceEntity.setChoice(input.getChoice()); // very dangerous, bind with id + entityToUpdate.addChoiceVoteToChoice(voteToChoiceEntity); + } + voteToChoiceEntity.setVoteValue(value); + // update needed ?? + + } else if (voteToChoiceEntity != null) { + + entityToUpdate.removeChoiceVoteToChoice(voteToChoiceEntity); + delete(voteToChoiceDao, voteToChoiceEntity); + } + } + if (log.isDebugEnabled()) { log.debug("Entity updated: " + vote.getTopiaId()); } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-23 17:15:58 UTC (rev 3205) @@ -23,9 +23,11 @@ */ package org.chorem.pollen.ui.actions.poll; +import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ParameterAware; import org.chorem.pollen.bean.PollResult; import org.chorem.pollen.bean.PollResultList; import org.chorem.pollen.business.persistence.Choice; @@ -48,6 +50,7 @@ import java.text.DateFormat; import java.util.Date; import java.util.List; +import java.util.Map; /** * Abstract action for actions on the vote poll page. @@ -55,33 +58,35 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.2.6 */ -public abstract class AbstractVoteAction extends AbstractPollUriIdAction { +public abstract class AbstractVoteAction extends AbstractPollUriIdAction implements ParameterAware { private static final long serialVersionUID = 1L; /** Logger. */ private static final Log log = LogFactory.getLog(AbstractVoteAction.class); - /** - * Keep this service as property to avoid new instance for each loop in - * {@link #getResultValue(Choice)} - */ private transient PollResultsService pollResultsService; + + private transient PollService pollService; + private transient VoteService voteService; + private Poll poll; private boolean feedFileExisting; + private String voteCountingTypeHelp; + private boolean creatorUser; private PollAccount pollAccount; private boolean alreadyVoted; - - private String voteCountingTypeHelp; - - private String accountName; + private List<Vote> votes; + + private Vote vote; + private String commentName; private String voteSizeMessage; @@ -89,19 +94,40 @@ private List<PollResult> results; private List<Comment> comments; + + private Map<String, String[]> parameters; @Override public String getPageLogo() { return "Vote"; } - private PollResultsService getPollResultsService() { + protected PollResultsService getPollResultsService() { if (pollResultsService == null) { pollResultsService = newService(PollResultsService.class); } return pollResultsService; } + + protected PollService getPollService() { + if (pollService == null) { + pollService = newService(PollService.class); + } + return pollService; + } + protected VoteService getVoteService() { + if (voteService == null) { + voteService = newService(VoteService.class); + } + return voteService; + } + + @Override + public void setParameters(Map<String, String[]> parameters) { + this.parameters = parameters; + } + public Poll getPoll() { return poll; } @@ -110,10 +136,31 @@ return feedFileExisting; } + public String getVoteCountingTypeHelp() { + return voteCountingTypeHelp; + } + public PollAccount getPollAccount() { return pollAccount; } + public List<Vote> getVotes() { + return votes; + } + + public Vote getVote() { + return vote; + } + + public VoteToChoice getVoteToChoice(int index) { + return getVote().getChoiceVoteToChoice().get(index); + } + + public boolean getVoteValueAsBoolean(int index) { + Integer value = getVoteToChoice(index).getVoteValue(); + return value == 1; + } + public boolean isPollChoiceOrVoteStarted() { Date now = serviceContext.getCurrentTime(); return poll.isAddChoiceStarted(now) || poll.isStarted(now); @@ -127,14 +174,6 @@ return poll.isAnonymous(); } - public String getVoteCountingTypeHelp() { - return voteCountingTypeHelp; - } - - public String getAccountName() { - return accountName; - } - public List<PollResult> getResults() { return results; } @@ -232,11 +271,19 @@ } public void resetCommentName() { - setCommentName(getAccountName()); + setCommentName(getPollAccount().getVotingId()); } public void prepareVotePage() throws Exception { + // Ensure pollId for loading + if (getPollId() == null) { + log.debug("parameters= " + parameters); + String uriId = parameters.get("uriId")[0]; + log.debug("uriId= " + uriId); + setUriId(uriId); + } + loadPoll(); setDateFormat(DateFormat.getDateTimeInstance( @@ -244,6 +291,7 @@ DateFormat.SHORT, getLocale())); loadPollAccount(); + loadVotes(); loadPollResults(); loadPollComments(); @@ -356,14 +404,14 @@ } protected void loadPoll() throws PollNotFoundException { - - PollService service = newService(PollService.class); - + if (StringUtils.isNotEmpty(pollId)) { - poll = service.getPollByPollId(pollId); + poll = getPollService().getPollByPollId(pollId); } + Preconditions.checkNotNull(poll, "Can't load poll with id = [" + pollId + "]"); + + log.debug("Poll TopiaId: " + poll.getTopiaId()); - if (poll.isClosed()) { addActionMessage(_("pollen.information.pollClosed")); } else if (!isPollStarted()) { @@ -378,74 +426,72 @@ protected void loadPollAccount() throws PollNotFoundException { - PollService service = newService(PollService.class); - //// Contrôle et définition du votingId - alreadyVoted = false; - boolean modifAllowed = false; - boolean restrictedListsForbidden = false; +// alreadyVoted = false; +// boolean modifAllowed = false; +// boolean restrictedListsForbidden = false; - // The calcul of alreadyVoted will be needed for no double votingId - // Carefull, not correct for an anonymous vote - VoteService voteService = newService(VoteService.class); - // Suppression des espaces pouvant provoquer un double vote - pollAccount = service.getNewPollAccount(getPollenUserAccount()); - String votingId = pollAccount.getVotingId().trim(); - pollAccount.setVotingId(votingId); + // TODO maybe it's better to keep current pollAccount instead of creating one each time + pollAccount = getPollService().getNewPollAccount(getPollenUserAccount()); +// String votingId = pollAccount.getVotingId().trim(); +// pollAccount.setVotingId(votingId); +// +// // The calcul of alreadyVoted will be needed for no double votingId +// // Carefull, not correct for an anonymous vote +// alreadyVoted = getVoteService().hasAlreadyVoted(votingId, poll); +// +// // Check for restricted poll +// if (!alreadyVoted && !isFreePoll()) { +// +// if (StringUtils.isNotEmpty(getAccountId())) { +// +// // The accountUId must be valid for the poll +// PollAccount restrictedAccount = +// getPollService().getRestrictedAccount(getPollId(), getAccountId()); +// +// if (restrictedAccount != null) { +// // PollAccount is replaced by the good account from db +// pollAccount = restrictedAccount; +// +// // Refresh alreadyVoted value depends on pollAccount +//// alreadyVoted = pollAccount.isHasVoted(); +// +// } else { +// // Existing account is null is forbidden for a restricted poll +// restrictedListsForbidden = true; +// } +// +// } else { +// // Not allowed to vote without an accountUId +// restrictedListsForbidden = true; +// } +// +// if (restrictedListsForbidden) { +// addActionError(_("pollen.error.user.restrictedListsForbidden")); +// } +// } +// +// // Génération d'un identifiant de vote (si le sondage est libre et anonyme) +// if (poll.isAnonymous() && isFreePoll()) { +// getPollAccount().setVotingId( +// "anonymous" + serviceContext.createPollenUrlId()); +// } +// +// modifAllowed = isModifAllowed(getPollAccount().getVotingId()); +// if (alreadyVoted && !modifAllowed) { +// addActionError(_("pollen.error.user.alreadyVoted", +// getPollAccount().getVotingId())); +// } + } + + protected void loadVotes() { + + // TODO no pagination for the moment, need to retrieve the correct page depends on current pollAccount + votes = getPoll().getVote(); - alreadyVoted = voteService.hasAlreadyVoted(votingId, poll); - - // Check for restricted poll - if (!alreadyVoted && !isFreePoll()) { - - if (StringUtils.isNotEmpty(getAccountId())) { - - // The accountUId must be valid for the poll - PollAccount restrictedAccount = - service.getRestrictedAccount(getPollId(), getAccountId()); - - if (restrictedAccount != null) { - // PollAccount is replaced by the good account from db - pollAccount = restrictedAccount; - - // Refresh alreadyVoted value depends on pollAccount -// alreadyVoted = pollAccount.isHasVoted(); - - } else { - // Existing account is null is forbidden for a restricted poll - restrictedListsForbidden = true; - } - - } else { - // Not allowed to vote without an accountUId - restrictedListsForbidden = true; - } - - if (restrictedListsForbidden) { - addActionError(_("pollen.error.user.restrictedListsForbidden")); - } - } - - // Génération d'un identifiant de vote (si le sondage est libre et anonyme) - if (poll.isAnonymous() && isFreePoll()) { - getPollAccount().setVotingId( - "anonymous" + serviceContext.createPollenUrlId()); - } - - modifAllowed = isModifAllowed(getPollAccount().getVotingId()); - if (alreadyVoted && !modifAllowed) { - addActionError(_("pollen.error.user.alreadyVoted", - getPollAccount().getVotingId())); - } - - // Initialize accountName - UserAccount userAccount = getPollenUserAccount(); - if (userAccount != null) { - accountName = userAccount.getDisplayName(); - } else { - accountName = getPollAccount().getAccountId(); - } + // Current vote + vote = getVoteService().getVote(getPoll(), getVotes(), getPollAccount()); } protected void loadPollComments() { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-03-23 17:15:58 UTC (rev 3205) @@ -24,6 +24,7 @@ package org.chorem.pollen.ui.actions.poll; import com.opensymphony.xwork2.Preparable; +import org.chorem.pollen.business.persistence.Vote; /** * Votes to a poll. @@ -35,6 +36,10 @@ private static final long serialVersionUID = 1L; + public void setVoteValueAsBoolean(int index, boolean value) { + getVoteToChoice(index).setVoteValue(value ? 1 : 0); + } + @Override public String input() throws Exception { @@ -44,9 +49,15 @@ @Override public String execute() throws Exception { + + if (getVote().getTopiaId() != null) { + getVoteService().updateVote(getVote()); + + } else { + Vote voteCreated = getVoteService().createVote(getVote()); + getPollService().addVoteToPoll(getPoll(), voteCreated); + } - //TODO Do me! - return SUCCESS; } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-23 17:15:58 UTC (rev 3205) @@ -108,9 +108,9 @@ <interceptor-ref name="checkbox"/> <interceptor-ref name="multiselect"/> <interceptor-ref name="pollenFileUpload"/> - <interceptor-ref name="params"> + <interceptor-ref name="servletConfig"/> <interceptor-ref name="staticParams"/> @@ -119,9 +119,9 @@ <interceptor-ref name="modelDriven"/>  <interceptor-ref name="actionMappingParams"/> -  -  -  + <interceptor-ref name="params"> + <param name="excludeParams">dojo\..*,^struts\..*</param> + </interceptor-ref> <interceptor-ref name="conversionError"/> <interceptor-ref name="validation"> <param name="excludeMethods">input,back,cancel,browse</param> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-03-23 17:15:49 UTC (rev 3204) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-03-23 17:15:58 UTC (rev 3205) @@ -161,6 +161,7 @@ autoOpen="false" modal="true" width="800"/> <s:form id="voteForm"> +<s:hidden key="uriId"/> <table id="poll"> <thead> <tr> @@ -257,32 +258,37 @@ <tr> <s:if test="accountFieldDisplayed"> <th id="voterName"> - <s:textfield id='pollAccountName' required="true" + <s:textfield key='pollAccount.votingId' required="true" value="%{pollAccount.votingId}" theme="simple"/> </th> </s:if> <s:else> <th></th> </s:else> - <s:iterator value="poll.choice" var="choice"> + <s:iterator value="poll.choice" var="choice" status="status"> <s:if test="!isChoiceHidden(#choice)"> <th> <s:if test="normalVoteCounting"> - <s:checkbox name="addChoice" theme="simple"/> + <s:checkbox name="voteValueAsBoolean[%{#status.index}]" + value="%{voteValueAsBoolean[#status.index]}" theme="simple"/> </s:if> <s:if test="percentageVoteCounting"> - <s:textfield value="#choice.value" size="3" required="true" - theme="simple"/> + <s:textfield name="voteToChoice[%{#status.index}].voteValue" + value="%{voteToChoice[#status.index].voteValue}" + required="true" size="3" theme="simple"/> <%--t:validate="required, min=0, max=100"/>%--%> </s:if> <s:if test="condorcetVoteCounting"> - <s:textfield id="condorcetInput" value="choice.value" size="3" - theme="simple"/> + <s:textfield name="voteToChoice[%{#status.index}].voteValue" + value="%{voteToChoice[#status.index].voteValue}" + id="condorcetInput" size="3" theme="simple"/> <%--t:nulls="zero" t:validate="min=0, max=99"/>--%> </s:if> <s:if test="numberVoteCounting"> - <s:textfield value="addNumberVote" size="3" theme="simple"/> + <s:textfield name="voteToChoice[%{#status.index}].voteValue" + value="%{voteToChoice[#status.index].voteValue}" + size="3" theme="simple"/> </s:if> </th> </s:if> @@ -292,7 +298,7 @@ </s:if> <tbody> <s:if test="!poll.anonymous"> - <s:iterator value="poll.vote" var="vote"> + <s:iterator value="votes" var="vote"> <tr> <td> <s:if test="accountFieldDisplayed">

1 0

r3204 - branches/pollen-1.2.6-struts2
by fdesbois＠users.chorem.org March 23, 2012

March 23, 2012

Author: fdesbois Date: 2012-03-23 18:15:49 +0100 (Fri, 23 Mar 2012) New Revision: 3204 Url: http://chorem.org/repositories/revision/pollen/3204 Log: Use last mavenpom Modified: branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-03-23 17:15:45 UTC (rev 3203) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-03-23 17:15:49 UTC (rev 3204) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.1.1</version> + <version>3.2.1-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId> @@ -508,12 +508,6 @@ <version>${nuitonI18nVersion}</version> </plugin> - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <version>2.0-beta-1</version> - </plugin> - </plugins> </pluginManagement>

1 0

r3203 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by fdesbois＠users.chorem.org March 23, 2012

March 23, 2012

Author: fdesbois Date: 2012-03-23 18:15:45 +0100 (Fri, 23 Mar 2012) New Revision: 3203 Url: http://chorem.org/repositories/revision/pollen/3203 Log: Use new methods for flags in Poll and improve code organization Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModifyVote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-23 08:56:10 UTC (rev 3202) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-03-23 17:15:45 UTC (rev 3203) @@ -62,64 +62,61 @@ /** Logger. */ private static final Log log = LogFactory.getLog(AbstractVoteAction.class); - protected Poll poll; + /** + * Keep this service as property to avoid new instance for each loop in + * {@link #getResultValue(Choice)} + */ + private transient PollResultsService pollResultsService; - protected boolean feedFileExisting; + private Poll poll; - protected boolean creatorUser; + private boolean feedFileExisting; - protected boolean pollChoiceOrVoteStarted; + private boolean creatorUser; - protected boolean accountFieldDisplayed; + private PollAccount pollAccount; - protected boolean pollChoiceRunning; + private boolean alreadyVoted; - protected boolean pollRunning; + private String voteCountingTypeHelp; - protected boolean alreadyVoted; + private String accountName; + + private String commentName; - private boolean anonymousVote; + private String voteSizeMessage; - protected String voteCountingTypeHelp; - - protected String defaultCommentName; - - protected String creatorName; - - protected String commentName; - - protected String voteSizeMessage; - - private PollAccount pollAccount; - private List<PollResult> results; private List<Comment> comments; @Override - public final String getPageLogo() { + public String getPageLogo() { return "Vote"; } - public final Poll getPoll() { - return poll; + private PollResultsService getPollResultsService() { + if (pollResultsService == null) { + pollResultsService = newService(PollResultsService.class); + } + return pollResultsService; } - public PollAccount getPollAccount() { - if (pollAccount == null) { - PollService service = newService(PollService.class); - pollAccount = service.getNewPollAccount( - getPollenUserAccount()); - } - return pollAccount; + public Poll getPoll() { + return poll; } - public final boolean isFeedFileExisting() { + public boolean isFeedFileExisting() { return feedFileExisting; } + public PollAccount getPollAccount() { + return pollAccount; + } + public boolean isPollChoiceOrVoteStarted() { - return pollChoiceOrVoteStarted; + Date now = serviceContext.getCurrentTime(); + return poll.isAddChoiceStarted(now) || poll.isStarted(now); } public boolean isAlreadyVoted() { @@ -127,21 +124,17 @@ } public boolean isAnonymousVote() { - return anonymousVote; + return poll.isAnonymous(); } - public final String getVoteCountingTypeHelp() { + public String getVoteCountingTypeHelp() { return voteCountingTypeHelp; } - public final String getDefaultCommentName() { - return defaultCommentName; + public String getAccountName() { + return accountName; } - public final String getCommentName() { - return commentName; - } - public List<PollResult> getResults() { return results; } @@ -150,194 +143,155 @@ return comments; } - public void prepareVotePage() throws Exception { + public boolean isCreatorUser() { + return creatorUser; + } - loadPoll(); + public boolean isAccountFieldDisplayed() { + return !poll.isAnonymous() || isRestrictedPoll() || isGroupPoll(); + } - setDateFormat(DateFormat.getDateTimeInstance( - DateFormat.SHORT, - DateFormat.SHORT, getLocale())); + public boolean isPollChoiceRunning() { + Date now = serviceContext.getCurrentTime(); + return poll.isAddChoiceRunning(now); + } - if (poll != null) { + public boolean isPollRunning() { + Date now = serviceContext.getCurrentTime(); + return poll.isRunning(now); + } - loadPollAccount(); - loadPollResults(); - loadPollComments(); + public String getCreatorName() { + return poll.getCreator().getAccountId(); + } - PollFeedService pollFeedService = newService(PollFeedService.class); + public String getVoteSizeMessage() { + return voteSizeMessage; + } - feedFileExisting = pollFeedService.isFeedExists(poll); + public boolean isDescNull(Choice choice) { + return StringUtils.isEmpty(choice.getDescription()); + } - VoteCountingType voteCountingType = poll.getVoteCountingType(); - switch (voteCountingType) { + public boolean isFreePoll() { + return poll.getPollType() == PollType.FREE; + } - case NORMAL: - voteCountingTypeHelp = - _("pollen.common.voteCountingTypeHelp.normal"); - break; - case PERCENTAGE: - voteCountingTypeHelp = - _("pollen.common.voteCountingTypeHelp.percentage"); - break; - case CONDORCET: - voteCountingTypeHelp = - _("pollen.common.voteCountingTypeHelp.condorcet"); - break; - case NUMBER: - voteCountingTypeHelp = - _("pollen.common.voteCountingTypeHelp.number"); - break; - } + public boolean isRestrictedPoll() { + return poll.getPollType() == PollType.RESTRICTED; + } - // set default comment name - UserAccount userAccount = getPollenUserAccount(); - if (userAccount == null) { - defaultCommentName = ""; - } else { - defaultCommentName = userAccount.getDisplayName(); - } + public boolean isGroupPoll() { + return poll.getPollType() == PollType.GROUP; + } - Date currentTime = serviceContext.getCurrentTime(); + public boolean isTextType() { + return poll.getChoiceType() == ChoiceType.TEXT; + } - accountFieldDisplayed = !poll.isAnonymous() || isRestrictedPoll() || isGroupPoll(); + public boolean isDateType() { + return poll.getChoiceType() == ChoiceType.DATE; + } - boolean choicestarted = poll.getBeginChoiceDate() == null || poll.getBeginChoiceDate().before(currentTime); - boolean choiceended = poll.getEndChoiceDate() != null && poll.getEndChoiceDate().before(currentTime); - boolean pollChoiceStarted = choicestarted && !choiceended; + public boolean isImageType() { + return poll.getChoiceType() == ChoiceType.IMAGE; + } - //TODO Move this is poll entity - pollChoiceOrVoteStarted = pollChoiceStarted || isPollStarted(); + public boolean isNormalVoteCounting() { + return poll.getVoteCountingType() == VoteCountingType.NORMAL; + } - pollChoiceRunning = poll.isChoiceAddAllowed() && pollChoiceStarted; + public boolean isPercentageVoteCounting() { + return poll.getVoteCountingType() == VoteCountingType.PERCENTAGE; + } - pollRunning = !poll.isClosed() && isPollStarted() && !isPollFinished(); + public boolean isCondorcetVoteCounting() { + return poll.getVoteCountingType() == VoteCountingType.CONDORCET; + } - //TODO Deal the case of the not loggued poll (using the pollAccountId - creatorUser = getPollenUserAccount() != null && - getPollenUserAccount().equals(poll.getCreator().getUserAccount()); - - if (log.isInfoEnabled()) { - log.info("pollChoiceOrVoteStarted = " + pollChoiceOrVoteStarted); - log.info("pollChoiceRunning = " + pollChoiceRunning); - log.info("pollRunning = " + pollRunning); - log.info("accountFieldDisplayed = " + accountFieldDisplayed); - log.info("creatorUser = " + creatorUser); - } - creatorName = poll.getCreator().getVotingId(); - -// voteSizeMessage=XXX; - } + public boolean isNumberVoteCounting() { + return poll.getVoteCountingType() == VoteCountingType.NUMBER; } - private transient PollResultsService pollResultsService; - - private PollResultsService getPollResultsService() { - if (pollResultsService == null) { - pollResultsService = newService(PollResultsService.class); - } - return pollResultsService; + public boolean isPollStarted() { + Date now = serviceContext.getCurrentTime(); + return poll.getBeginDate() == null || poll.getBeginDate().before(now); } - public String getResultValue(Choice choice) { - - String val = getPollResultsService().getResultValue(choice, results); - return val; + public boolean isPollFinished() { + Date now = serviceContext.getCurrentTime(); + return poll.getEndDate() != null && poll.getEndDate().before(now); } - protected void loadPollComments() { - - PollCommentService service = newService(PollCommentService.class); - - comments = service.getAllComments(poll.getPollId()); + public String getCommentName() { + return commentName; } - protected void loadPollResults() throws PollNotFoundException { - - PollResultsService service = getPollResultsService(); - - PollResultList pollResultList = service.getResults(poll.getPollId()); - - results = pollResultList.getPollResults(); - - if (log.isDebugEnabled()) { - for (PollResult res : results) { - log.debug(res.getName() + ": " + res.getValue() - + ", (voteCounting=" + res.getVoteCountingType() - + ", byGroup=" + res.isByGroup() + ")"); - } - } + public void setCommentName(String commentName) { + this.commentName = commentName; } + + public void resetCommentName() { + setCommentName(getAccountName()); + } - protected void loadPollAccount() throws PollNotFoundException { + public void prepareVotePage() throws Exception { - PollService service = newService(PollService.class); + loadPoll(); - //// Contrôle et définition du votingId - alreadyVoted = false; - boolean modifAllowed = false; - boolean restrictedListsForbidden = false; + setDateFormat(DateFormat.getDateTimeInstance( + DateFormat.SHORT, + DateFormat.SHORT, getLocale())); - // The calcul of alreadyVoted will be needed for no double votingId - // Carefull, not correct for an anonymous vote - VoteService voteService = newService(VoteService.class); + loadPollAccount(); + loadPollResults(); + loadPollComments(); - // Suppression des espaces pouvant provoquer un double vote - String votingId = getPollAccount().getVotingId().trim(); - getPollAccount().setVotingId(votingId); + PollFeedService pollFeedService = newService(PollFeedService.class); + feedFileExisting = pollFeedService.isFeedExists(poll); - alreadyVoted = voteService.hasAlreadyVoted(votingId, poll); + VoteCountingType voteCountingType = poll.getVoteCountingType(); + switch (voteCountingType) { - // Check for restricted poll - if (!alreadyVoted && !isFreePoll()) { + case NORMAL: + voteCountingTypeHelp = + _("pollen.common.voteCountingTypeHelp.normal"); + break; + case PERCENTAGE: + voteCountingTypeHelp = + _("pollen.common.voteCountingTypeHelp.percentage"); + break; + case CONDORCET: + voteCountingTypeHelp = + _("pollen.common.voteCountingTypeHelp.condorcet"); + break; + case NUMBER: + voteCountingTypeHelp = + _("pollen.common.voteCountingTypeHelp.number"); + break; + } - if (StringUtils.isNotEmpty(getAccountId())) { + //TODO Deal the case of the not loggued poll (using the pollAccountId + creatorUser = getPollenUserAccount() != null && + getPollenUserAccount().equals(poll.getCreator().getUserAccount()); - // The accountUId must be valid for the poll - PollAccount restrictedAccount = - service.getRestrictedAccount(getPollId(), getAccountId()); + resetCommentName(); - if (restrictedAccount != null) { - // PollAccount is replaced by the good account from db - pollAccount = restrictedAccount; - - // Refresh alreadyVoted value depends on pollAccount -// alreadyVoted = pollAccount.isHasVoted(); - - } else { - // Existing account is null is forbidden for a restricted poll - restrictedListsForbidden = true; - } - - } else { - // Not allowed to vote without an accountUId - restrictedListsForbidden = true; - } - - if (restrictedListsForbidden) { - addActionError(_("pollen.error.user.restrictedListsForbidden")); - } + if (log.isInfoEnabled()) { + log.info("pollChoiceOrVoteStarted = " + isPollChoiceOrVoteStarted()); + log.info("pollChoiceRunning = " + isPollChoiceRunning()); + log.info("pollRunning = " + isPollRunning()); + log.info("accountFieldDisplayed = " + isAccountFieldDisplayed()); + log.info("creatorUser = " + creatorUser); } + } - // Génération d'un identifiant de vote (si le sondage est libre et anonyme) - if (poll.isAnonymous()) { - anonymousVote = true; - if (isFreePoll()) { - getPollAccount().setVotingId( - "anonymous" + serviceContext.createPollenUrlId()); - } - } + public String getResultValue(Choice choice) { - modifAllowed = isModifAllowed(getPollAccount().getVotingId()); - if (alreadyVoted && !modifAllowed) { - addActionError(_("pollen.error.user.alreadyVoted", - getPollAccount().getVotingId())); - } + String val = getPollResultsService().getResultValue(choice, results); + return val; } - public String escapeLineBreak(String text) { - return text; - } - /** * Retourne si le choix fait partie du vote (s'il a été renseigné par le * votant). @@ -372,7 +326,7 @@ Vote vote = poll.getVoteByTopiaId(voteId); // can only modify a vote if poll is running. - if (vote != null && pollRunning) { + if (vote != null && isPollRunning()) { PollAccount votePollAccount = vote.getPollAccount(); // si le votant du vote correspond au votant actuel (pollAccountId) @@ -393,30 +347,14 @@ return result; } - public boolean isCreatorUser() { - return creatorUser; + public String escapeLineBreak(String text) { + return text; } - public boolean isAccountFieldDisplayed() { - return accountFieldDisplayed; + public String formatChoiceNameAsDate(Choice choice) { + return formatDate(new Date(Long.valueOf(choice.getName()))); } - public boolean isPollChoiceRunning() { - return pollChoiceRunning; - } - - public boolean isPollRunning() { - return pollRunning; - } - - public String getCreatorName() { - return creatorName; - } - - public String getVoteSizeMessage() { - return voteSizeMessage; - } - protected void loadPoll() throws PollNotFoundException { PollService service = newService(PollService.class); @@ -425,77 +363,112 @@ poll = service.getPollByPollId(pollId); } - if (poll == null) { - addActionError(_("pollen.error.poll.notfound")); - } else { - if (poll.isClosed()) { - addActionMessage(_("pollen.information.pollClosed")); - } else if (!isPollStarted()) { - addActionMessage(_("pollen.information.pollNotStarted")); - } else if (isPollFinished()) { - addActionMessage(_("pollen.information.pollFinished")); - } - if (isPollChoiceRunning()) { - addActionMessage(_("pollen.information.pollChoiceRunning")); - } + + if (poll.isClosed()) { + addActionMessage(_("pollen.information.pollClosed")); + } else if (!isPollStarted()) { + addActionMessage(_("pollen.information.pollNotStarted")); + } else if (isPollFinished()) { + addActionMessage(_("pollen.information.pollFinished")); } + if (isPollChoiceRunning()) { + addActionMessage(_("pollen.information.pollChoiceRunning")); + } } - public boolean isDescNull(Choice choice) { - return StringUtils.isEmpty(choice.getDescription()); - } + protected void loadPollAccount() throws PollNotFoundException { - public boolean isFreePoll() { - return poll.getPollType() == PollType.FREE; - } + PollService service = newService(PollService.class); - public boolean isRestrictedPoll() { - return poll.getPollType() == PollType.RESTRICTED; - } + //// Contrôle et définition du votingId + alreadyVoted = false; + boolean modifAllowed = false; + boolean restrictedListsForbidden = false; - public boolean isGroupPoll() { - return poll.getPollType() == PollType.GROUP; - } + // The calcul of alreadyVoted will be needed for no double votingId + // Carefull, not correct for an anonymous vote + VoteService voteService = newService(VoteService.class); - public boolean isTextType() { - return poll.getChoiceType() == ChoiceType.TEXT; - } + // Suppression des espaces pouvant provoquer un double vote + pollAccount = service.getNewPollAccount(getPollenUserAccount()); + String votingId = pollAccount.getVotingId().trim(); + pollAccount.setVotingId(votingId); - public boolean isDateType() { - return poll.getChoiceType() == ChoiceType.DATE; - } + alreadyVoted = voteService.hasAlreadyVoted(votingId, poll); - public boolean isImageType() { - return poll.getChoiceType() == ChoiceType.IMAGE; - } + // Check for restricted poll + if (!alreadyVoted && !isFreePoll()) { - public boolean isNormalVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.NORMAL; - } + if (StringUtils.isNotEmpty(getAccountId())) { - public boolean isPercentageVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.PERCENTAGE; - } + // The accountUId must be valid for the poll + PollAccount restrictedAccount = + service.getRestrictedAccount(getPollId(), getAccountId()); - public boolean isCondorcetVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.CONDORCET; - } + if (restrictedAccount != null) { + // PollAccount is replaced by the good account from db + pollAccount = restrictedAccount; - public boolean isNumberVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.NUMBER; - } + // Refresh alreadyVoted value depends on pollAccount +// alreadyVoted = pollAccount.isHasVoted(); - public boolean isPollStarted() { - Date now = serviceContext.getCurrentTime(); - return poll.getBeginDate() == null || poll.getBeginDate().before(now); + } else { + // Existing account is null is forbidden for a restricted poll + restrictedListsForbidden = true; + } + + } else { + // Not allowed to vote without an accountUId + restrictedListsForbidden = true; + } + + if (restrictedListsForbidden) { + addActionError(_("pollen.error.user.restrictedListsForbidden")); + } + } + + // Génération d'un identifiant de vote (si le sondage est libre et anonyme) + if (poll.isAnonymous() && isFreePoll()) { + getPollAccount().setVotingId( + "anonymous" + serviceContext.createPollenUrlId()); + } + + modifAllowed = isModifAllowed(getPollAccount().getVotingId()); + if (alreadyVoted && !modifAllowed) { + addActionError(_("pollen.error.user.alreadyVoted", + getPollAccount().getVotingId())); + } + + // Initialize accountName + UserAccount userAccount = getPollenUserAccount(); + if (userAccount != null) { + accountName = userAccount.getDisplayName(); + } else { + accountName = getPollAccount().getAccountId(); + } } - public boolean isPollFinished() { - Date now = serviceContext.getCurrentTime(); - return poll.getEndDate() != null && poll.getEndDate().before(now); + protected void loadPollComments() { + + PollCommentService service = newService(PollCommentService.class); + + comments = service.getAllComments(poll.getPollId()); } - public String formatChoiceNameAsDate(Choice choice) { - return formatDate(new Date(Long.valueOf(choice.getName()))); + protected void loadPollResults() throws PollNotFoundException { + + PollResultsService service = getPollResultsService(); + + PollResultList pollResultList = service.getResults(poll.getPollId()); + + results = pollResultList.getPollResults(); + + if (log.isDebugEnabled()) { + for (PollResult res : results) { + log.debug(res.getName() + ": " + res.getValue() + + ", (voteCounting=" + res.getVoteCountingType() + + ", byGroup=" + res.isByGroup() + ")"); + } + } } } \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-03-23 08:56:10 UTC (rev 3202) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-03-23 17:15:45 UTC (rev 3203) @@ -42,10 +42,6 @@ /** Text of the comment. */ protected String commentText; - public void setCommentName(String commentName) { - this.commentName = commentName; - } - public String getCommentText() { return commentText; } @@ -60,23 +56,22 @@ loadPoll(); - Preconditions.checkNotNull(commentName); - Preconditions.checkNotNull(commentText); + Preconditions.checkNotNull(getCommentName()); + Preconditions.checkNotNull(getCommentText()); PollCommentService service = newService(PollCommentService.class); // prepare a new poll account for the comment PollAccount pollAccount = service.getNewPollAccount( - getPollenUserAccount(), commentName); + getPollenUserAccount(), getCommentName()); // prepare a new comment - Comment comment = service.getNewComment(pollAccount, commentText); + Comment comment = service.getNewComment(pollAccount, getCommentText()); // create the comment - service.createComment(poll, comment); + service.createComment(getPoll(), comment); - // let's use back default comment name - commentName = getDefaultCommentName(); + resetCommentName(); return SUCCESS; } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-03-23 08:56:10 UTC (rev 3202) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-03-23 17:15:45 UTC (rev 3203) @@ -64,8 +64,7 @@ service.deleteComment(commentId); - commentName = getDefaultCommentName(); - + resetCommentName(); return SUCCESS; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModifyVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModifyVote.java 2012-03-23 08:56:10 UTC (rev 3202) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ModifyVote.java 2012-03-23 17:15:45 UTC (rev 3203) @@ -37,14 +37,8 @@ @Override public String execute() throws Exception { - loadPoll(); - - if (poll == null) { - - } - return SUCCESS; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-03-23 08:56:10 UTC (rev 3202) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-03-23 17:15:45 UTC (rev 3203) @@ -54,6 +54,5 @@ public void prepare() throws Exception { prepareVotePage(); - commentName = getDefaultCommentName(); } }

1 0

r3202 - in branches/pollen-1.2.6-struts2: . pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/resources pollen-ui-struts2/src/main/webapp/WEB-INF
by bleny＠users.chorem.org March 23, 2012

March 23, 2012

Author: bleny Date: 2012-03-23 09:56:10 +0100 (Fri, 23 Mar 2012) New Revision: 3202 Url: http://chorem.org/repositories/revision/pollen/3202 Log: mise en place de shiro sur pollen-struts (pom, web.xml, shiro.ini, filtre d'admin) : fonctionne mais on est redirig?\195?\169 vers login.jsp Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenShiroFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-03-22 15:13:57 UTC (rev 3201) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-03-23 08:56:10 UTC (rev 3202) @@ -128,6 +128,11 @@ <artifactId>jetty-runner</artifactId> </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + </dependency> +  <dependency> <groupId>javax.servlet</groupId> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenShiroFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenShiroFilter.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenShiroFilter.java 2012-03-23 08:56:10 UTC (rev 3202) @@ -0,0 +1,37 @@ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.shiro.web.filter.authz.AuthorizationFilter; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; + +public class PollenShiroFilter extends AuthorizationFilter { + + private static final Log log = LogFactory.getLog(PollenShiroFilter.class); + + @Override + protected boolean isAccessAllowed(ServletRequest servletRequest, ServletResponse servletResponse, Object mappedValue) { + + PollenSession pollenSession = PollenActionSupport.getPollenSession(servletRequest); + + UserAccount userAccount = pollenSession.getUserAccount(); + + boolean isAccessAllowed = userAccount != null && userAccount.isAdministrator(); + + if (log.isDebugEnabled()) { + if (isAccessAllowed) { + log.debug("granting access to an admin-reserved page"); + } else { + log.debug("illegal access to an admin-reserved page, user will be sent to " + getUnauthorizedUrl()); + } + } + + return isAccessAllowed; + + } + +} Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-03-22 15:13:57 UTC (rev 3201) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-03-23 08:56:10 UTC (rev 3202) @@ -41,7 +41,9 @@ import org.nuiton.web.filter.TopiaTransactionFilter; import org.nuiton.web.struts2.BaseAction; +import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; import java.net.URL; import java.text.DateFormat; import java.text.ParseException; @@ -109,6 +111,16 @@ return "Index"; } + public static PollenSession getPollenSession(ServletRequest servletRequest) { + HttpSession httpSession = ((HttpServletRequest) servletRequest).getSession(true); + PollenSession pollenSession = (PollenSession) httpSession.getAttribute(SESSION_PARAMETER); + if (pollenSession == null) { + pollenSession = new PollenSession(); + httpSession.setAttribute(SESSION_PARAMETER, pollenSession); + } + return pollenSession; + } + public PollenSession getPollenSession() { if (pollenSession == null) { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-03-22 15:13:57 UTC (rev 3201) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-03-23 08:56:10 UTC (rev 3202) @@ -28,4 +28,5 @@ log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.chorem.pollen.ui.PollenShiroFilter=DEBUG log4j.logger.org.nuiton=INFO Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/shiro.ini 2012-03-23 08:56:10 UTC (rev 3202) @@ -0,0 +1,8 @@ +[main] + +pollenFilter=org.chorem.pollen.ui.PollenShiroFilter +pollenFilter.unauthorizedUrl=bordel.jsp + +[urls] + +/admin/**=pollenFilter Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-22 15:13:57 UTC (rev 3201) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-03-23 08:56:10 UTC (rev 3202) @@ -67,16 +67,16 @@ <interceptor name="pollenFileUpload" class="org.chorem.pollen.ui.interceptors.PollenFileUploadInterceptor"/> - <interceptor name="checkUserLoggued" - class="org.chorem.pollen.ui.interceptors.CheckUserIsLogguedInterceptor"> - <param name="loginAction">/notLoggued</param> - <param name="redirectAction">/home</param> - </interceptor> +  +  +  +  +  - <interceptor name="checkUserAdmin" - class="org.chorem.pollen.ui.interceptors.CheckUserIsAdmin"> - <param name="redirectAction">/notAdmin</param> - </interceptor> +  +  +  +   <interceptor-stack name="pollenBasicStack"> @@ -88,13 +88,13 @@ </interceptor-stack> <interceptor-stack name="pollenBasicLogguedStack"> - <interceptor-ref name="checkUserLoggued"/> +  <interceptor-ref name="pollenBasicStack"/> </interceptor-stack> <interceptor-stack name="pollenBasicAdminStack"> - <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="checkUserAdmin"/> +  <interceptor-ref name="pollenBasicStack"/> </interceptor-stack> @@ -135,13 +135,13 @@ </interceptor-stack> <interceptor-stack name="pollenParamsPrepareParamsLogguedStack"> - <interceptor-ref name="checkUserLoggued"/> +  <interceptor-ref name="pollenParamsPrepareParamsStack"/> </interceptor-stack> <interceptor-stack name="pollenParamsPrepareParamsAdminStack"> - <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="checkUserAdmin"/> +  +  <interceptor-ref name="pollenParamsPrepareParamsStack"/> </interceptor-stack> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-03-22 15:13:57 UTC (rev 3201) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-03-23 08:56:10 UTC (rev 3202) @@ -29,6 +29,7 @@ <display-name>Pollen</display-name> + <filter> <filter-name>topiaTransaction</filter-name> <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> @@ -40,6 +41,10 @@ org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter </filter-class> </filter> + <filter> + <filter-name>ShiroFilter</filter-name> + <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> + </filter> <filter> <filter-name>sitemesh</filter-name> @@ -59,6 +64,15 @@ </filter-mapping> <filter-mapping> + <filter-name>ShiroFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + + <filter-mapping> <filter-name>struts-prepare</filter-name> <url-pattern>/*</url-pattern> </filter-mapping> @@ -78,6 +92,11 @@ <listener-class>org.chorem.pollen.ui.PollenApplicationListener</listener-class> </listener> + <listener> + <description>Shiro security layer</description> + <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> + </listener> + <welcome-file-list> <welcome-file>/</welcome-file> <welcome-file>index.jsp</welcome-file> Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-03-22 15:13:57 UTC (rev 3201) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-03-23 08:56:10 UTC (rev 3202) @@ -146,6 +146,18 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <version>${shiroVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + <version>${shiroVersion}</version> + </dependency> + +  <dependency> <groupId>org.apache.tapestry</groupId> @@ -445,6 +457,7 @@ <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.1.2</struts2Version> <jqueryPluginVersion>3.2.1</jqueryPluginVersion> + <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion>

1 0

r3201 - in branches/pollen-1.2.6-struts2/pollen-persistence/src/main: java/org/chorem/pollen/business/persistence xmi
by fdesbois＠users.chorem.org March 22, 2012

March 22, 2012

Author: fdesbois Date: 2012-03-22 16:13:57 +0100 (Thu, 22 Mar 2012) New Revision: 3201 Url: http://chorem.org/repositories/revision/pollen/3201 Log: Add some methods in Poll model Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-03-22 15:13:51 UTC (rev 3200) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-03-22 15:13:57 UTC (rev 3201) @@ -25,6 +25,8 @@ import com.google.common.base.Preconditions; +import java.util.Date; + public class PollImpl extends PollAbstract { private static final long serialVersionUID = 1L; @@ -56,4 +58,35 @@ } return voteId; } + + @Override + public boolean isStarted(Date currentDate) { + return beginDate == null || beginDate.before(currentDate); + } + + @Override + public boolean isRunning(Date currentDate) { + return !isClosed() && isStarted(currentDate) && !isFinished(currentDate); + } + + @Override + public boolean isFinished(Date currentDate) { + return endDate != null && endDate.after(currentDate); + } + + @Override + public boolean isAddChoiceStarted(Date currentDate) { + return choiceAddAllowed && (beginChoiceDate == null || beginChoiceDate.before(currentDate)); + } + + @Override + public boolean isAddChoiceRunning(Date currentDate) { + return isAddChoiceStarted(currentDate) && !isAddChoiceFinished(currentDate); + } + + @Override + public boolean isAddChoiceFinished(Date currentDate) { + return !choiceAddAllowed || (endChoiceDate != null && endChoiceDate.after(currentDate)); + } + } //PollImpl Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ)

1 0

r3200 - branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config
by fdesbois＠users.chorem.org March 22, 2012

March 22, 2012

Author: fdesbois Date: 2012-03-22 16:13:51 +0100 (Thu, 22 Mar 2012) New Revision: 3200 Url: http://chorem.org/repositories/revision/pollen/3200 Log: Remove useless line for vote input in struts.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-22 10:38:33 UTC (rev 3199) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-03-22 15:13:51 UTC (rev 3200) @@ -92,12 +92,11 @@ <result type="redirectToVote"/> </action> -  +  <action name="votefor/*" method="input" class="org.chorem.pollen.ui.actions.poll.VoteForPoll"> <param name="uriId">{1}</param> <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> - <result>/WEB-INF/jsp/poll/vote.jsp</result> </action>

1 0

r3199 - in branches/pollen-1.2.6-struts2: . pollen-ui-struts2
by fdesbois＠users.chorem.org March 22, 2012

March 22, 2012

Author: fdesbois Date: 2012-03-22 11:38:33 +0100 (Thu, 22 Mar 2012) New Revision: 3199 Url: http://chorem.org/repositories/revision/pollen/3199 Log: Add default configuration for jetty and tomcat7 as embedded servers Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml branches/pollen-1.2.6-struts2/pom.xml Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-03-22 10:38:29 UTC (rev 3198) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-03-22 10:38:33 UTC (rev 3199) @@ -211,10 +211,27 @@ <webAppConfig> <contextPath>/pollen</contextPath> </webAppConfig> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>http://localhost:8080/pollen</value> + </systemProperty> + </systemProperties> </configuration> </plugin> <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <configuration> + <path>/pollen</path> + <systemProperties> + <siteUrl>http://localhost:8080/pollen</siteUrl> + </systemProperties> + </configuration> + </plugin> + + <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> <archive> Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-03-22 10:38:29 UTC (rev 3198) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-03-22 10:38:33 UTC (rev 3199) @@ -495,20 +495,12 @@ <version>${nuitonI18nVersion}</version> </plugin> -  <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <version>1.4</version> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.0-beta-1</version> </plugin> -  - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jettyVersion}</version> - </plugin> - </plugins> </pluginManagement>

1 0

r3198 - branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen
by fdesbois＠users.chorem.org March 22, 2012

March 22, 2012

Author: fdesbois Date: 2012-03-22 11:38:29 +0100 (Thu, 22 Mar 2012) New Revision: 3198 Url: http://chorem.org/repositories/revision/pollen/3198 Log: Improve error for applicationUrl not defined Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-22 10:38:24 UTC (rev 3197) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-03-22 10:38:29 UTC (rev 3198) @@ -24,6 +24,7 @@ package org.chorem.pollen; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -85,9 +86,10 @@ "Could not parse configuration", e); } - // check application url is ok - URL applicationUrl = getApplicationUrl(); - if (applicationUrl == null) { + // application url is a mandatory property + String applicationUrl = + applicationConfig.getOption(PollenConfigurationOption.APPLICATION_URL.key); + if (StringUtils.isBlank(applicationUrl)) { throw new IllegalStateException( "No application url defined in configuration, please fill the property '" + PollenConfigurationOption.APPLICATION_URL.key + "'");

1 0

r3197 - branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen
by fdesbois＠users.chorem.org March 22, 2012

March 22, 2012

Author: fdesbois Date: 2012-03-22 11:38:24 +0100 (Thu, 22 Mar 2012) New Revision: 3197 Url: http://chorem.org/repositories/revision/pollen/3197 Log: Add explicit close for resource Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-03-19 09:05:44 UTC (rev 3196) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-03-22 10:38:24 UTC (rev 3197) @@ -61,6 +61,7 @@ try { input = getClass().getResourceAsStream(configPath); properties.load(input); + input.close(); } catch (IOException e) { throw new PollenTechnicalException(e); } finally {

1 0

r3196 - branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org March 19, 2012

March 19, 2012

Author: tchemit Date: 2012-03-19 10:05:44 +0100 (Mon, 19 Mar 2012) New Revision: 3196 Url: http://chorem.org/repositories/revision/pollen/3196 Log: fix poll creation Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-15 10:40:12 UTC (rev 3195) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-03-19 09:05:44 UTC (rev 3196) @@ -161,7 +161,7 @@ preventRuleCreated.setRepeated(preventRule.isRepeated()); preventRuleCreated.setScope(preventRule.getScope()); preventRuleCreated.setSensibility(preventRule.getSensibility()); - result.addPreventRule(preventRule); + result.addPreventRule(preventRuleCreated); } }

1 0