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

r3436 - trunk/pollen-services/src/main/resources/i18n
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 23:07:58 +0200 (Sun, 10 Jun 2012) New Revision: 3436 Url: http://chorem.org/repositories/revision/pollen/3436 Log: fix i18n Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-06-10 20:58:46 UTC (rev 3435) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-06-10 21:07:58 UTC (rev 3436) @@ -11,7 +11,7 @@ pollen.common.numberVote-total-votes=Nombre total de votes pollen.common.unauthorized=Non autorisé pollen.common.undefined=Non défini -pollen.email.createPoll.content=Vous venez de créer le sondage "%1$s" (identifiant %2$s).\n\nRetrouvez tous les liens pour y accéder sur cette page \:\n\n%s +pollen.email.createPoll.content=Vous venez de créer le sondage "%s" (identifiant %s).\n\nRetrouvez tous les liens pour y accéder sur cette page \:\n\n%s pollen.email.createPoll.subject=[Pollen] Création d'un sondage (%1$s) pollen.email.createRestrictedPoll.content=Vous venez de créer le sondage "%s".\nRetrouvez tous les liens pour y accéder sur cette page \:\n\n%s pollen.email.createRestrictedPoll.subject=[Pollen] Création d'un sondage restreint (%s)

1 0

r3435 - in trunk: pollen-persistence/src/test/resources pollen-services/src/test/resources
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:58:46 +0200 (Sun, 10 Jun 2012) New Revision: 3435 Url: http://chorem.org/repositories/revision/pollen/3435 Log: mock tmpDir in test configuration Modified: trunk/pollen-persistence/src/test/resources/pollen-fake.properties trunk/pollen-services/src/test/resources/pollen-fake.properties Modified: trunk/pollen-persistence/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-persistence/src/test/resources/pollen-fake.properties 2012-06-10 20:47:46 UTC (rev 3434) +++ trunk/pollen-persistence/src/test/resources/pollen-fake.properties 2012-06-10 20:58:46 UTC (rev 3435) @@ -35,4 +35,5 @@ siteUrl=http://meFake/pollen upImgDir=${testDirectory}/.pollen/uploadedImages feedDir=${testDirectory}/.pollen/feeds +tmpDir=${testDirectory}/.pollen/tmpDir pollen.emails.directory=${testDirectory}/.pollen/emails Modified: trunk/pollen-services/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-services/src/test/resources/pollen-fake.properties 2012-06-10 20:47:46 UTC (rev 3434) +++ trunk/pollen-services/src/test/resources/pollen-fake.properties 2012-06-10 20:58:46 UTC (rev 3435) @@ -36,4 +36,5 @@ siteUrl=http://meFake/pollen upImgDir=${testDirectory}/.pollen/uploadedImages feedDir=${testDirectory}/.pollen/feeds +tmpDir=${testDirectory}/.pollen/tmpDir pollen.emails.directory=${testDirectory}/.pollen/emails

1 0

r3434 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:47:46 +0200 (Sun, 10 Jun 2012) New Revision: 3434 Url: http://chorem.org/repositories/revision/pollen/3434 Log: fixes #585: Can not clone image-choice poll fixes #589: Can not save a poll (image choice) if there is a first validation error Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-10 20:47:46 UTC (rev 3434) @@ -853,72 +853,109 @@ commitTransaction("Could not delete choice " + choice.getName()); } - public File getPollChoiceImageFile(String pollId, - String choiceId, - boolean thumb) { + /** + * Obtain the location of an image choice. + * + * @param pollId the id of the poll containing the image choice + * @param choiceId the id of the choice to render + * @return the location of image + * @since 1.4 + */ + public File getPollChoiceImageFile(String pollId, String choiceId) { File imageDirectory = getConfiguration().getImageDirectory(); File pollDirectory = new File(imageDirectory, pollId); - if (thumb) { - choiceId = THUMB_PREFIX + choiceId; - } File result = new File(pollDirectory, choiceId); return result; } +// public File getPollChoiceImageFile(String pollId, +// String choiceId, +// boolean thumb) { +// File imageDirectory = getConfiguration().getImageDirectory(); +// File pollDirectory = new File(imageDirectory, pollId); +// +// if (thumb) { +// choiceId = THUMB_PREFIX + choiceId; +// } +// File result = new File(pollDirectory, choiceId); +// +// return result; +// } /** + * given the location of an image, gets his name as a thumb image. + * + * @param imagePath location of the image + * @return location of the thumb of a given image + * @since 1.4 + */ + public File getImageThumbFile(File imagePath) { + + File imageDirectory = imagePath.getParentFile(); + + File result = new File(imageDirectory, + THUMB_PREFIX + imagePath.getName()); + + return result; + } + + /** * Sauvegarde des images d'un choix de type image. * * @param poll le sondage contenant le choix * @param choice le choix à sauvegarder. - * @throws IOException si un problème IO lors de la copie ou génération de la miniature + * @throws IOException si un problème IO lors de la copie ou + * génération de la miniature */ public void saveImages(Poll poll, PollImageChoice choice) throws IOException { String pollId = poll.getPollId(); String name = choice.getName(); - generateThumb(pollId, name, choice); - } + File pollChoiceImage = getPollChoiceImageFile(pollId, name); - public void generateThumb(String pollId, - String name, - PollImageChoice choice) throws IOException { + // copy image to correct directory - File pollChoiceImage = getPollChoiceImageFile(pollId, name, false); - File pollChoiceImageThumb = getPollChoiceImageFile(pollId, name, true); + String location = choice.getLocation(); - if (choice != null) { + FileUtils.copyFile(new File(location), pollChoiceImage); - // means must copy it + // generate thumb + generateThumbIfNeeded(pollChoiceImage); + } + public File generateThumbIfNeeded(File pollChoiceImage) throws IOException { - String location = choice.getLocation(); + File pollChoiceImageThumb = getImageThumbFile(pollChoiceImage); - FileUtils.copyFile(new File(location), pollChoiceImage); - } - int width = 100; - ImageIcon ii = new ImageIcon(pollChoiceImage.getAbsolutePath()); - Image image = ii.getImage(); - double imageRatio = (double) image.getHeight(null) - / (double) image.getWidth(null); - int height = (int) (width * imageRatio); + if (!pollChoiceImageThumb.exists()) { - BufferedImage thumbImage = new BufferedImage(width, height, - BufferedImage.TYPE_INT_RGB); - Graphics2D graphics2D = thumbImage.createGraphics(); - graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION, - RenderingHints.VALUE_INTERPOLATION_BILINEAR); - graphics2D.drawImage(image, 0, 0, width, height, null); + int width = 100; + ImageIcon ii = new ImageIcon(pollChoiceImage.getAbsolutePath()); + Image image = ii.getImage(); + double imageRatio = (double) image.getHeight(null) + / (double) image.getWidth(null); + int height = (int) (width * imageRatio); - ImageIO.write(thumbImage, "jpg", pollChoiceImageThumb); + BufferedImage thumbImage = new BufferedImage( + width, height, BufferedImage.TYPE_INT_RGB); + Graphics2D graphics2D = thumbImage.createGraphics(); + graphics2D.setRenderingHint( + RenderingHints.KEY_INTERPOLATION, + RenderingHints.VALUE_INTERPOLATION_BILINEAR); + graphics2D.drawImage(image, 0, 0, width, height, null); - if (log.isDebugEnabled()) { - log.debug("Thumbnail created: " + pollChoiceImageThumb.getName() + " (size=" - + pollChoiceImageThumb.length() + ")"); + ImageIO.write(thumbImage, "jpg", pollChoiceImageThumb); + + if (log.isDebugEnabled()) { + log.debug("Thumbnail created: " + + pollChoiceImageThumb.getName() + " (size=" + + pollChoiceImageThumb.length() + ")"); + } } + return pollChoiceImageThumb; } public PersonToList getNewPersonToList(PollAccount pollAccount) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-10 20:47:46 UTC (rev 3434) @@ -23,7 +23,7 @@ package org.chorem.pollen.ui.actions.io; import com.google.common.base.Preconditions; -import org.chorem.pollen.services.impl.PollService; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.ui.actions.PollenActionSupport; import javax.activation.MimetypesFileTypeMap; @@ -41,6 +41,8 @@ private static final long serialVersionUID = 1L; + protected String choiceTokenId; + protected String pollId; protected String choiceId; @@ -51,6 +53,10 @@ protected String contentType; + public void setChoiceTokenId(String choiceTokenId) { + this.choiceTokenId = choiceTokenId; + } + public void setPollId(String pollId) { this.pollId = pollId; } @@ -74,11 +80,27 @@ @Override public String execute() throws Exception { - Preconditions.checkNotNull(pollId); - Preconditions.checkNotNull(choiceId); + File file; - File file = getPollService().getPollChoiceImageFile(pollId, choiceId, thumb); + if (StringUtils.isNotBlank(choiceTokenId)) { + // use location from session + file = getPollenSession().consumeDynamicData(choiceTokenId); + } else { + + // using pollId / choiceId to find image to render + + Preconditions.checkNotNull(pollId); + Preconditions.checkNotNull(choiceId); + + file = getPollService().getPollChoiceImageFile(pollId, choiceId); + + if (thumb) { + + file = getPollService().getImageThumbFile(file); + } + } + MimetypesFileTypeMap mimes = new MimetypesFileTypeMap(); contentType = mimes.getContentType(file); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-10 20:47:46 UTC (rev 3434) @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.bean.PollImageChoice; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.PersonToList; import org.chorem.pollen.business.persistence.Poll; @@ -38,9 +39,12 @@ import org.chorem.pollen.common.PollType; import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.PollenServiceFunctions; +import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; +import java.io.File; +import java.io.IOException; import java.util.Collection; import java.util.List; import java.util.Map; @@ -229,7 +233,7 @@ } public boolean isEdit() { - return StringUtils.isNotEmpty(getPoll().getTopiaId()); + return StringUtils.isNotBlank(getPoll().getTopiaId()); } public void prepareFormPage() throws Exception { @@ -292,13 +296,12 @@ protected void loadChoicesAndvotingLists(Poll poll, Collection<Choice> pollChoices, Collection<VotingList> pollVotinLists, - boolean fillLists) { + boolean fillLists) throws IOException { Preconditions.checkNotNull(poll); Preconditions.checkNotNull(poll.getChoiceType()); Preconditions.checkNotNull(poll.getPollType()); - if (CollectionUtils.isNotEmpty(pollChoices)) { //push back choices @@ -313,6 +316,44 @@ break; case IMAGE: getImageChoices().addAll(pollChoices); + + // if images are not still saved in a poll, then thumb + // does not exists, must create a temporary one + for (Choice choice : pollChoices) { + PollImageChoice imageChoice = (PollImageChoice) choice; + String choiceId = imageChoice.getTopiaId(); + File imageChoiceFile; + + PollService service = getPollService(); + if (StringUtils.isBlank(choiceId)) { + + // new choice, must create the thumb + imageChoiceFile = + new File(imageChoice.getLocation()); + + if (imageChoiceFile.exists()) { + + service.generateThumbIfNeeded(imageChoiceFile); + } + } else { + + // already persisted choice, nothing to do + imageChoiceFile = service.getPollChoiceImageFile( + poll.getPollId(), choice.getName()); + + } + + File thumbFile = service.getImageThumbFile( + imageChoiceFile); + + // keep in session the location of this thumb (do not + // want to expose the full path location in url) + getPollenSession().putDynamicData( + "imagechoicesThumb_" + choice.getName(), + thumbFile); + } + + break; } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-10 20:47:46 UTC (rev 3434) @@ -22,13 +22,20 @@ */ package org.chorem.pollen.ui.actions.poll; +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.bean.PollImageChoice; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.PreventRule; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.VotingList; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.services.impl.PreventRuleService; +import java.io.File; import java.util.List; /** @@ -45,6 +52,9 @@ private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(LoadPoll.class); + private PollUri pollUri; private boolean clone; @@ -68,22 +78,55 @@ UserAccount userAccount = getPollenUserAccount(); String pollUid = pollUri == null ? null : pollUri.getPollId(); - poll = getPollService().getPollEditable(pollUid, userAccount, clone); + PollService service = getPollService(); + poll = service.getPollEditable(pollUid, userAccount, clone); + if (poll.isClosed()) { addFlashWarning(_("pollen.warning.poll.is.closed.so.read.only")); } List<Choice> pollChoices = poll.getChoice(); + + if (clone) { + + if (ChoiceType.IMAGE == poll.getChoiceType()) { + + // recopy images to tmp + + File tmpDir = getConfiguration().getTemporaryDirectory(); + for (Choice choice : pollChoices) { + String choiceName = choice.getName(); + + // image from poll to clone + File imageChoiceFile = service.getPollChoiceImageFile( + pollUid, + choiceName + ); + + // new image + File newImageChoiceFile = File.createTempFile( + choiceName, null, tmpDir); + + if (log.isInfoEnabled()) { + log.info("Copy image from " + imageChoiceFile + + " to " + newImageChoiceFile); + } + FileUtils.copyFile(imageChoiceFile, + newImageChoiceFile); + + ((PollImageChoice) choice).setLocation( + newImageChoiceFile.getAbsolutePath()); + } + } + } + List<VotingList> pollVotingLists = poll.getVotingList(); loadChoicesAndvotingLists(poll, pollChoices, pollVotingLists, !isVoteStarted()); - //TODO-tchemit comment me Simplyf this! -// if (poll.getMaxChoiceNb() > 0) { -// setLimitChoice(true); -// } + setLimitChoice(poll.getMaxChoiceNb() > 0); PreventRule reminder = poll.getPreventRuleByScope( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-10 20:47:46 UTC (rev 3434) @@ -30,6 +30,7 @@ import com.opensymphony.xwork2.interceptor.annotations.InputConfig; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.MapUtils; +import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -131,17 +132,6 @@ prepareFormPage(); String pollUid = getNonEmptyParameterValue("poll.pollId"); - //TODO-tchemit comment me No ! inverse tests otherwise make possible to change owner of a poll! :( - // Retrieve userAccount to attach to the poll -// UserAccount userAccount = getPollenUserAccount(); -// if (userAccount == null) { -// -// // from parameter userId if defined during update loading -// String userId = getNonEmptyParameterValue("userId"); -// if (userId != null) { -// userAccount = getPollService().getEntityById(UserAccount.class, userId); -// } -// } String userId = getNonEmptyParameterValue("userId"); if (StringUtils.isBlank(userId)) { @@ -154,8 +144,8 @@ UserAccount userAccount = null; if (StringUtils.isNotBlank(userId)) { // load use account to use - userAccount = - getPollService().getEntityById(UserAccount.class, userId); + userAccount = getPollService().getEntityById( + UserAccount.class, userId); } // get a copy (or a fresh new poll) @@ -184,17 +174,9 @@ choices = buildImageChoices(); break; } - //TODO-tchemit comment me No the nullite tests is not possible : if pollType is null not possible ? PollType pollType; String pollTypeParam = getNonEmptyParameterValue("poll.pollType"); pollType = PollType.valueOf(pollTypeParam); -// if (pollTypeParam == null) { -// pollType = poll.getPollType(); -// -// } else { -// pollType = PollType.valueOf(pollTypeParam); -// } - switch (pollType) { case FREE: @@ -221,13 +203,44 @@ } @Override - public String input() { + public String input() throws Exception { Collection<Choice> pollChoices = isVoteStarted() ? poll.getChoice() : choices.values(); Collection<VotingList> pollVotingLists = isVoteStarted() ? poll.getVotingList() : votingLists.values(); + + if (ChoiceType.IMAGE == poll.getChoiceType()) { + + // recopy images for new choices, the one uploaded will be + // destroyed, by the upload interceptor + + File tmpDir = getConfiguration().getTemporaryDirectory(); + + for (Choice choice : pollChoices) { + + String choiceId = choice.getTopiaId(); + + if (StringUtils.isBlank(choiceId)) { + + PollImageChoice imageChoice = (PollImageChoice) choice; + + File uploadedImage = new File(imageChoice.getLocation()); + File copyImage = File.createTempFile( + uploadedImage.getName(), null, tmpDir); + + if (log.isInfoEnabled()) { + log.info("Copy image from " + uploadedImage + + " to " + copyImage); + } + FileUtils.copyFile(uploadedImage, copyImage); + + imageChoice.setLocation(copyImage.getAbsolutePath()); + } + } + } + loadChoicesAndvotingLists(poll, pollChoices, pollVotingLists, true); return INPUT; } @@ -251,13 +264,6 @@ // Clear previous collections to save those from the form poll.clearChoice(); poll.clearVotingList(); - //TODO-tchemit comment me this variables, works directly on choices -// Map<Integer, Choice> orderedChoices = choices; -// -// for (Integer index : orderedChoices.keySet()) { -// Choice choice = orderedChoices.get(index); -// poll.addChoice(choice); -// } for (Integer index : choices.keySet()) { Choice choice = choices.get(index); poll.addChoice(choice); Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-10 20:47:46 UTC (rev 3434) @@ -165,10 +165,10 @@ <s:hidden id="%{#prefix}.location" name="%{#prefix}.location" value="%{#choice.location}" label='' theme="simple"/> <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="false"> - <s:param name="choiceId" value="%{#choice.name}"/> - <s:param name="pollId" value="poll.pollId"/> - <s:param name="thumb" value="true"/> + escapeAmp="true"> + <s:param name="choiceTokenId"> + imagechoicesThumb_<s:property value='name'/> + </s:param> </s:url> <img name="<s:property value="#prefix"/>.thumb" alt="<s:property value='name'/>" @@ -181,11 +181,7 @@ <s:else> <%--New image--%> <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="false" value="/img/7ter.jpg"> - <s:param name="choiceId" value="%{#choice.name}"/> - <s:param name="pollId" value="poll.pollId"/> - <s:param name="thumb" value="true"/> - </s:url> + escapeAmp="false" value="/img/7ter.jpg"/> <img name="<s:property value="#prefix"/>.thumb" alt="<s:text name='pollen.image.not.loaded'/>" title="<s:text name='pollen.image.not.loaded'/>" Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-10 20:44:13 UTC (rev 3433) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-10 20:47:46 UTC (rev 3434) @@ -48,11 +48,7 @@ <%--<s:else>--%> <%--New image--%> <s:url id="imageUrl" namespace="/io" action="getPollChoiceImage" - escapeAmp="false" value="/img/7ter.jpg"> - <s:param name="choiceId" value="%{#choice.name}"/> - <s:param name="pollId" value="poll.pollId"/> - <s:param name="thumb" value="true"/> - </s:url> + escapeAmp="false" value="/img/7ter.jpg"/> <img name="<s:property value="#prefix"/>.thumb" alt="<s:text name='pollen.image.not.loaded'/>" title="<s:text name='pollen.image.not.loaded'/>"

1 0

r3433 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:44:13 +0200 (Sun, 10 Jun 2012) New Revision: 3433 Url: http://chorem.org/repositories/revision/pollen/3433 Log: fixes #588: Can not vote for normal poll type Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-10 20:42:22 UTC (rev 3432) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-10 20:44:13 UTC (rev 3433) @@ -137,7 +137,7 @@ VoteService voteService = getVoteService(); - if (vote.getTopiaId() == null) { + if (StringUtils.isNotBlank(vote.getTopiaId())) { // create a new vote voteService.createVote(poll, vote);

1 0

r3432 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/resources/i18n pollen-ui-struts2/src/main/java/org/chorem/pollen/ui
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:42:22 +0200 (Sun, 10 Jun 2012) New Revision: 3432 Url: http://chorem.org/repositories/revision/pollen/3432 Log: add a new directory to keep temporary image choice Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-10 20:42:22 UTC (rev 3432) @@ -87,6 +87,7 @@ createDirectory(PollenConfigurationOption.EMAIL_DIR); createDirectory(PollenConfigurationOption.FEED_DIR); createDirectory(PollenConfigurationOption.IMG_DIR); + createDirectory(PollenConfigurationOption.TMP_DIR); if (log.isDebugEnabled()) { log.debug("parsed options in config file" + @@ -182,6 +183,12 @@ return result; } + public File getTemporaryDirectory() { + File result = applicationConfig.getOptionAsFile( + PollenConfigurationOption.TMP_DIR.key); + return result; + } + public int getNbVotesPerPage() { int result = applicationConfig.getOptionAsInt( PollenConfigurationOption.NB_VOTES_PER_PAGE.key); Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-10 20:42:22 UTC (rev 3432) @@ -43,35 +43,52 @@ /** login for default admin. */ APPLICATION_URL("siteUrl", n_("pollen.configuration.siteUrl"), "", URL.class), + /** login for default admin. */ DATA_DIR("pollen.dataDirectory", n_("pollen.configuration.dataDirectory"), "/var/local/pollen/data", File.class), + /** login for default admin. */ ADMIN_LOGIN("adminLogin", n_("pollen.configuration.db.login"), "admin", String.class), + /** password for default admin. */ ADMIN_PASSWORD("adminPassword", n_("pollen.configuration.db.password"), "pollen", String.class), + /** email for default admin. */ ADMIN_EMAIL("adminEmail", n_("pollen.configuration.adminEmail"), "admin(a)domain.com", String.class), + /** email for contact link. */ CONTACT_EMAIL("contactEmail", n_("pollen.configuration.contactEmail"), "", String.class), + /** host for email sending configuration. */ EMAIL_HOST("email_host", n_("pollen.configuration.emailHost"), "smtp", String.class), + /** port for email sending configuration. */ EMAIL_PORT("email_port", n_("pollen.configuration.emailPort"), "25", String.class), + /** from for email sending configuration. */ EMAIL_FROM("email_from", n_("pollen.configuration.emailFrom"), "bot(a)pollen.org", String.class), + /** directory to store emails before sending them. */ EMAIL_DIR("pollen.emails.directory", n_("pollen.configuration.emaiDirectory"), "${pollen.dataDirectory}/emails", File.class), + /** path for feed directory. */ FEED_DIR("feedDir", n_("pollen.configuration.feedDirectory"), "${pollen.dataDirectory}/feeds", File.class), + /** path for uploaded images directory. */ IMG_DIR("upImgDir", n_("pollen.configuration.imageDirectory"), "${pollen.dataDirectory}/uploadedImages", File.class), + + /** path for temporary directory. */ + TMP_DIR("tmpDir", n_("pollen.configuration.tmpDirectory"), "${pollen.dataDirectory}/tmp", File.class), + /** nb votes to display per page. */ NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", n_("pollen.configuration.nbVoteByPage"), "25", int.class), + /** Charset of Pollen. */ CHARSET("pollen.charset", n_("pollen.configuration.charset"), "UTF-8", String.class), /** Default poll type to use at a new poll creation. */ DEFAULT_POLL_TYPE("pollen.default.pollType", n_("pollen.configuration.defaultPollType"), PollType.FREE.name(), PollType.class), + /** Default vote counting type to use at a new poll creation. */ DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), VoteCountingType.NORMAL.name(), VoteCountingType.class), Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-06-10 20:42:22 UTC (rev 3432) @@ -21,3 +21,4 @@ pollen.configuration.imageDirectory=path for uploaded images directory pollen.configuration.nbVoteByPage=nb votes to display per page pollen.configuration.siteUrl=Application url +pollen.configuration.tmpDirectory=Temporary directory (is cleaned at each startup of application) Modified: trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-06-10 20:42:22 UTC (rev 3432) @@ -21,3 +21,4 @@ pollen.configuration.imageDirectory=répertoire où sont enregistrés les images pollen.configuration.nbVoteByPage=Nombre de votes à afficher par page pollen.configuration.siteUrl=Url publique de l'aplication (utilisée dans les emails envoyés) +pollen.configuration.tmpDirectory=Répertoire temporaire (est nettoyé à chaque démarrage de l'application) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-10 20:41:43 UTC (rev 3431) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-10 20:42:22 UTC (rev 3432) @@ -24,6 +24,7 @@ import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; @@ -41,10 +42,12 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaUtil; +import org.nuiton.util.FileUtil; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; +import java.io.File; import java.io.IOException; import java.util.Date; import java.util.Locale; @@ -93,6 +96,16 @@ PollenConfiguration configuration = new PollenConfiguration(); applicationContext.setConfiguration(configuration); + File temporaryDirectory = configuration.getTemporaryDirectory(); + try { + FileUtils.deleteDirectory(temporaryDirectory); + FileUtil.createDirectoryIfNecessary(temporaryDirectory); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not delete tmp dir " + temporaryDirectory, e); + } + } + if (log.isInfoEnabled()) { log.info("Initializing RootContext..."); }

1 0

r3431 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:41:43 +0200 (Sun, 10 Jun 2012) New Revision: 3431 Url: http://chorem.org/repositories/revision/pollen/3431 Log: remove old commented code Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-06-10 20:39:26 UTC (rev 3430) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-06-10 20:41:43 UTC (rev 3431) @@ -74,8 +74,9 @@ PollService pollService = getPollService(); - List<Poll> pollList = pollService.getCreatedPolls(pager, - getPollenUserAccount()); + List<Poll> pollList = pollService.getCreatedPolls( + pager, + getPollenUserAccount()); polls = new Map[pollList.size()]; Binder<Poll, Poll> binder = @@ -105,35 +106,8 @@ result.add("novote"); } result.add("summary"); -// result.add("result"); -// if (!poll.isClosed()) { -// -// // poll is not closed -// result.add("edit"); -// result.add("close"); -// } -// result.add("export"); -// result.add("clone"); result.add("delete"); return result; } -// /** -// * Retrieve the id for result page depends on {@code poll}. -// * It's not necessary to use {@code adminId} if the poll results are public. -// * But the {@code adminId} is mandatory if the poll is restricted (security). -// * -// * @param poll Poll -// * @return the pollId if results are public or the adminId if not -// */ -// protected String getResultId(Poll poll) { -// String result; -// if (PollType.FREE == poll.getPollType() && poll.isPublicResults()) { -// result = poll.getPollId(); -// -// } else { -// result = poll.getAdminId(); -// } -// return result; -// } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-06-10 20:39:26 UTC (rev 3430) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-06-10 20:41:43 UTC (rev 3431) @@ -76,8 +76,8 @@ PollService pollService = getPollService(); - List<Pair<Poll, PollAccount>> invitedPolls = pollService.getInvitedPolls(pager, - getPollenUserAccount()); + List<Pair<Poll, PollAccount>> invitedPolls = + pollService.getInvitedPolls(pager, getPollenUserAccount()); polls = new Map[invitedPolls.size()]; Binder<Poll, Poll> binder =

1 0

r3430 - trunk
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:39:26 +0200 (Sun, 10 Jun 2012) New Revision: 3430 Url: http://chorem.org/repositories/revision/pollen/3430 Log: reuse old site configuration + update slf4j version Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-10 20:38:36 UTC (rev 3429) +++ trunk/pom.xml 2012-06-10 20:39:26 UTC (rev 3430) @@ -189,7 +189,7 @@ <struts2Version>2.3.4</struts2Version> <jqueryPluginVersion>3.3.1</jqueryPluginVersion> <shiroVersion>1.2.0</shiroVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <slf4jVersion>1.6.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> @@ -434,6 +434,17 @@ <artifactId>doxia-module-jrst</artifactId> <version>${jrstPluginVersion}</version> </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + </dependency> </dependencies> </plugin> @@ -589,62 +600,45 @@ </property> </activation> - <build> + <reporting> <plugins> <plugin> - <artifactId>maven-site-plugin</artifactId> - <inherited>false</inherited> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils-maven-report-plugin</artifactId> + <version>${nuitonUtilsVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>aggregate-application-config-report</report> + </reports> + </reportSet> + </reportSets> <configuration> - <reportPlugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils-maven-report-plugin</artifactId> - <reports> - <report>aggregate-application-config-report</report> - </reports> -  - <configuration> - <i18nBundleName>${pollenI18nBundle}</i18nBundleName> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reports> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - </reports> - </plugin> - </reportPlugins> + <i18nBundleName>${pollenI18nBundle}</i18nBundleName> </configuration> -  - <dependencies> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>${h2Version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>${hibernateVersion}</version> - </dependency> - </dependencies> </plugin> + + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </reportSet> + </reportSets> + </plugin> </plugins> - </build> + </reporting> </profile>

1 0

r3429 - in trunk/src/site: . fr/resources/images fr/rst rst
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:38:36 +0200 (Sun, 10 Jun 2012) New Revision: 3429 Url: http://chorem.org/repositories/revision/pollen/3429 Log: improve doc Removed: trunk/src/site/fr/resources/images/logos/ Modified: trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/index.rst trunk/src/site/fr/rst/install.rst.vm trunk/src/site/rst/index.rst trunk/src/site/rst/install.rst.vm trunk/src/site/rst/methods.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/fr/rst/depouillement.rst 2012-06-10 20:38:36 UTC (rev 3429) @@ -21,7 +21,7 @@ .. * #L% .. - Les méthodes de dépouillement de Pollen -======================================= +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Pollen permet différentes méthodes de dépouillement pour les consultations. Chaque méthode a ses avantages et ses inconvénients. Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/fr/rst/index.rst 2012-06-10 20:38:36 UTC (rev 3429) @@ -21,7 +21,7 @@ .. * #L% .. - Bienvenue sur le site de Pollen -------------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Pollen est une application de consultation web. Elle est destinée aux petites entités qui veulent un moyen simple de gérer des consultations tout en restant maître de leurs Modified: trunk/src/site/fr/rst/install.rst.vm =================================================================== --- trunk/src/site/fr/rst/install.rst.vm 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/fr/rst/install.rst.vm 2012-06-10 20:38:36 UTC (rev 3429) @@ -22,7 +22,7 @@ .. * #L% .. - Installer Pollen -================ +~~~~~~~~~~~~~~~~ Cette page décrit comment installer Pollen sur votre machine ou serveur. Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/rst/index.rst 2012-06-10 20:38:36 UTC (rev 3429) @@ -21,7 +21,7 @@ .. * #L% .. - Welcome to Pollen website -------------------------- +~~~~~~~~~~~~~~~~~~~~~~~~~ Pollen is web based poll/vote application. It is aimed to small entities that want to have a way to manage votes without giving their data to someone. Modified: trunk/src/site/rst/install.rst.vm =================================================================== --- trunk/src/site/rst/install.rst.vm 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/rst/install.rst.vm 2012-06-10 20:38:36 UTC (rev 3429) @@ -23,9 +23,9 @@ .. - Install Pollen -============== +~~~~~~~~~~~~~~ -This page describes how to instal Pollen on your computer or server. +This page describes how to install Pollen on your computer or server. Foreword ======== @@ -50,7 +50,7 @@ - the mail sending configuration (see the `Configure mail sending`_ section). If you want to know everything about Pollen configuration, go to the -`configuration page`_. +`configuration`_ page. Connect to Pollen ----------------- Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/rst/methods.rst 2012-06-10 20:38:36 UTC (rev 3429) @@ -21,7 +21,7 @@ .. * #L% .. - Pollen's votecounting methods -============================= +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Pollen allows you to chose between several votecounting methods for consultations. Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/site_en.xml 2012-06-10 20:38:36 UTC (rev 3429) @@ -89,8 +89,6 @@ </links> <menu name="Install"> - <item name="Download Pollen" - href="http://www.chorem.org/projects/pollen/files"/> <item name="Install Pollen" href="install.html"/> <item name="Configure Pollen" href="configure.html"/> </menu> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-10 20:09:43 UTC (rev 3428) +++ trunk/src/site/site_fr.xml 2012-06-10 20:38:36 UTC (rev 3429) @@ -89,8 +89,6 @@ </links> <menu name="Installation"> - <item name="Télécharger Pollen" - href="http://www.chorem.org/projects/pollen/files"/> <item name="Installer Pollen" href="install.html"/> <item name="Configurer Pollen" href="configure.html"/> </menu>

1 0

r3428 - in trunk: pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org June 10, 2012

June 10, 2012

Author: tchemit Date: 2012-06-10 22:09:43 +0200 (Sun, 10 Jun 2012) New Revision: 3428 Url: http://chorem.org/repositories/revision/pollen/3428 Log: refs #583: Make sure pollId is never used twice Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-06 12:25:14 UTC (rev 3427) +++ trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-10 20:09:43 UTC (rev 3428) @@ -39,7 +39,7 @@ org.chorem.pollen.business.persistence.Poll.attribute.pollId.tagValue.naturalId=true # clef naturelle non modifiable sur PollAccount#accountId -org.chorem.pollen.business.persistence.PollAccount.class.tagValue.naturalIdMutable=true +#org.chorem.pollen.business.persistence.PollAccount.class.tagValue.naturalIdMutable=true #org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique -org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true +#org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-06 12:25:14 UTC (rev 3427) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-10 20:09:43 UTC (rev 3428) @@ -93,14 +93,12 @@ generateMissingImageThumbs(tx); // add unique on Poll.pollId and PollAccount.accountId (http://www.chorem.org/issues/583) - addUniqueOnPollAndPollAccountIds(queries); + addUniqueOnPollIds(queries); } - private void addUniqueOnPollAndPollAccountIds(List<String> queries) { + private void addUniqueOnPollIds(List<String> queries) { queries.add("CREATE UNIQUE INDEX idx_Pöll_pollId ON poll(pollId);"); - queries.add("UPDATE pollaccount SET accountid = NULL WHERE accountid = '';"); - queries.add("CREATE UNIQUE INDEX idx_PollAccount_accountId ON pollAccount(accountId);"); } private void generateMissingImageThumbs(TopiaContextImplementor tx) throws TopiaException { @@ -146,39 +144,25 @@ String pollId = choiceId.getLeft(); String choiceName = choiceId.getRight(); - File pollChoiceImage = service.getPollChoiceImageFile( - pollId, choiceName, false); + File imageFile = service.getPollChoiceImageFile( + pollId, choiceName); - if (!pollChoiceImage.exists()) { + if (!imageFile.exists()) { // image does not exists, can not generate thumb if (log.isWarnEnabled()) { - log.warn("Could not find image choice " + pollChoiceImage); + log.warn("Could not find image choice " + imageFile); } continue; } - File pollChoiceImageThumb = service.getPollChoiceImageFile( - pollId, choiceName, true); + try { - boolean thumbExists = pollChoiceImageThumb.exists(); - - if (!thumbExists) { - - // creates thumb image - - if (log.isInfoEnabled()) { - log.info("Create missing thumb file " + - pollChoiceImageThumb); - } - try { - service.generateThumb(pollId, choiceName, null); - } catch (IOException e) { - throw new TopiaException("Could not create thumb for " + - pollChoiceImageThumb, e); - } + service.generateThumbIfNeeded(imageFile); + } catch (IOException e) { + throw new TopiaException("Could not create thumb for " + + imageFile, e); } - } }

1 0

r3427 - in trunk: pollen-persistence/src/main/xmi pollen-services/src/main/java/org/chorem/pollen/entities/migration src/site src/site/resources/images
by tchemit＠users.chorem.org June 6, 2012

June 6, 2012

Author: tchemit Date: 2012-06-06 14:25:14 +0200 (Wed, 06 Jun 2012) New Revision: 3427 Url: http://chorem.org/repositories/revision/pollen/3427 Log: reuse common logos add migration scripts to generate index (refs #583: Make sure pollId is never used twice) Removed: trunk/src/site/resources/images/logos/ Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-06 11:19:59 UTC (rev 3426) +++ trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-06 12:25:14 UTC (rev 3427) @@ -40,6 +40,6 @@ # clef naturelle non modifiable sur PollAccount#accountId org.chorem.pollen.business.persistence.PollAccount.class.tagValue.naturalIdMutable=true -org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique +#org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.stereotype=unique org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-06 11:19:59 UTC (rev 3426) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-06 12:25:14 UTC (rev 3427) @@ -91,8 +91,18 @@ // generate missing thumbs generateMissingImageThumbs(tx); + + // add unique on Poll.pollId and PollAccount.accountId (http://www.chorem.org/issues/583) + addUniqueOnPollAndPollAccountIds(queries); } + private void addUniqueOnPollAndPollAccountIds(List<String> queries) { + + queries.add("CREATE UNIQUE INDEX idx_Pöll_pollId ON poll(pollId);"); + queries.add("UPDATE pollaccount SET accountid = NULL WHERE accountid = '';"); + queries.add("CREATE UNIQUE INDEX idx_PollAccount_accountId ON pollAccount(accountId);"); + } + private void generateMissingImageThumbs(TopiaContextImplementor tx) throws TopiaException { TopiaSQLQuery<Pair<String, String>> getAllImageChoicesQuery = new TopiaSQLQuery<Pair<String, String>>() { Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-06-06 11:19:59 UTC (rev 3426) +++ trunk/src/site/site_en.xml 2012-06-06 12:25:14 UTC (rev 3427) @@ -56,23 +56,23 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="images/logos/struts2-logo.png"/> + img="http://maven-site.nuiton.org/public/images/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="images/logos/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="images/logos/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="images/logos/topia-logo.png"/> + img="http://maven-site.nuiton.org/public/images/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="images/logos/argouml-logo.png"/> + img="http://maven-site.nuiton.org/public/images/argouml-logo.png"/> </poweredBy> <body> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-06 11:19:59 UTC (rev 3426) +++ trunk/src/site/site_fr.xml 2012-06-06 12:25:14 UTC (rev 3427) @@ -59,20 +59,20 @@ img="${project.url}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="${project.url}/images/logos/struts2-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${project.url}/images/logos/restructuredtext-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/restructuredtext-logo.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" - img="${project.url}/images/logos/jrst-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/jrst-logo.png"/> <logo href="http://maven-site.nuiton.org/topia" name="ToPIA" - img="${project.url}/images/logos/topia-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${project.url}/images/logos/argouml-logo.png"/> + img="http://maven-site.nuiton.org/public/images/logos/argouml-logo.png"/> </poweredBy> <body>

1 0