Author: tchemit Date: 2012-06-05 18:50:22 +0200 (Tue, 05 Jun 2012) New Revision: 3423 Url: http://chorem.org/repositories/revision/pollen/3423 Log: - update file headers - move migration to service module (need now some services to perform migration) - move PollenApllicationContext to the service module (need now some services to perform migration) - fixes #582: Make the resume page bookmarkeable - fixes #584: Regenerate missing feed files - fixes #587: Improve poll admin actions Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java trunk/pollen-services/src/main/resources/META-INF/ trunk/pollen-services/src/main/resources/META-INF/services/ trunk/pollen-services/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp trunk/pollen-ui-struts2/src/main/webapp/css/summary.css trunk/pollen-ui-struts2/src/main/webapp/img/blank.png Removed: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/ trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp trunk/pollen-ui-struts2/src/main/webapp/css/resume.css Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 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/java/org/chorem/pollen/PollenFunctions.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-persistence/src/main/xmi/pollen.properties trunk/pollen-persistence/src/site/site_en.xml trunk/pollen-persistence/src/site/site_fr.xml trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java trunk/pollen-persistence/src/test/resources/log4j.properties trunk/pollen-persistence/src/test/resources/pollen-fake.properties trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-services/src/site/site_en.xml trunk/pollen-services/src/site/site_fr.xml trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java trunk/pollen-services/src/test/resources/log4j.properties trunk/pollen-services/src/test/resources/pollen-fake.properties trunk/pollen-ui-struts2/src/main/assembly/bin.xml trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.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/json/AbstractJSONPaginedAction.java 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/GetFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 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/GetParticipatedPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.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/AbstractPollUriIdAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.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/ParticipatedList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java 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/SelectPersonListToVotingList.java 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/user/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-io.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/log4j.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml trunk/pollen-ui-struts2/src/main/resources/pollen.properties trunk/pollen-ui-struts2/src/main/resources/struts.xml trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/validators.xml trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 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/displayDateChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml trunk/pollen-ui-struts2/src/main/webapp/css/common.css trunk/pollen-ui-struts2/src/main/webapp/css/main.css trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css trunk/pollen-ui-struts2/src/main/webapp/css/results.css trunk/pollen-ui-struts2/src/main/webapp/css/vote.css trunk/pollen-ui-struts2/src/main/webapp/index.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js trunk/pollen-ui-struts2/src/site/fr/rst/index.rst trunk/pollen-ui-struts2/src/site/site_en.xml trunk/pollen-ui-struts2/src/site/site_fr.xml trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java trunk/pollen-votecounting/src/main/resources/log4j.properties trunk/pollen-votecounting/src/site/site_en.xml trunk/pollen-votecounting/src/site/site_fr.xml trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java trunk/src/site/fr/rst/configure.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/index.rst trunk/src/site/rst/configure.rst trunk/src/site/rst/index.rst trunk/src/site/rst/methods.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/pom.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -49,10 +49,6 @@ <artifactId>topia-persistence</artifactId> </dependency> <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> - <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/CommentDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonListDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java (rev 0) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,58 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.business.persistence; + +/** + * Enumeration to get all possible actions on poll. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.4 + */ +public enum PollActions { + + ATTACH("user/attachPoll"), + VOTE("poll/votefor"), + RESULT("poll/results"), + SUMMARY("poll/summary"), + MODERATE("poll/votefor"), + EDIT("poll/modification"), + CLOSE("poll/close"), + CLONE("poll/clone"), + EXPORT("poll/export"), + DELETE("poll/delete"); + + /** + * Prefix to render url. + * + * @since 1.4 + */ + private final String actionPrefix; + + private PollActions(String actionPrefix) { + this.actionPrefix = actionPrefix; + } + + public String getActionPrefix() { + return actionPrefix; + } +} Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Deleted: trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion =================================================================== --- trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,5 +0,0 @@ -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_1 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_2 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_3 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_3_1 -org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_4 \ No newline at end of file Modified: trunk/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/main/xmi/pollen.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Persistence -# # $Id$ # $HeadURL$ # %% @@ -34,3 +33,13 @@ org.chorem.pollen.business.persistence.Poll.attribute.vote.stereotype=ordered org.chorem.pollen.business.persistence.Poll.attribute.vote.tagvalue.orderBy=topiaCreateDate +# clef naturelle non modifiable sur Poll#pollId +org.chorem.pollen.business.persistence.Poll.class.tagValue.naturalIdMutable=true +org.chorem.pollen.business.persistence.Poll.attribute.pollId.stereotype=unique +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.attribute.accountId.stereotype=unique +org.chorem.pollen.business.persistence.PollAccount.attribute.accountId.tagValue.naturalId=true + Modified: trunk/pollen-persistence/src/site/site_en.xml =================================================================== --- trunk/pollen-persistence/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - - $Id: site_en.xml 3394 2012-05-28 15:27:04Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/site/site_en.xm... $ + Pollen :: Persistence + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Property changes on: trunk/pollen-persistence/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/site/site_fr.xml =================================================================== --- trunk/pollen-persistence/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - - $Id: site_fr.xml 3394 2012-05-28 15:27:04Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/site/site_fr.xm... $ + Pollen :: Persistence + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Property changes on: trunk/pollen-persistence/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Persistence - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-persistence/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-persistence/src/test/resources/log4j.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/test/resources/log4j.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Persistence -# # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-persistence/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-persistence/src/test/resources/pollen-fake.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-persistence/src/test/resources/pollen-fake.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Persistence -# # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/pom.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -27,7 +27,18 @@ <artifactId>pollen-persistence</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> @@ -80,6 +91,10 @@ <artifactId>topia-persistence</artifactId> </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> Copied: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java (from rev 3421, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java) =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,101 @@ +/* + * #%L + * Pollen :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +import com.opensymphony.xwork2.ActionContext; +import org.chorem.pollen.services.PollenNotifierWorker; +import org.nuiton.topia.TopiaContext; + +import javax.servlet.ServletContext; +import java.util.Map; + +/** + * @author tchemit <chemit@codelutin.com> + * @since 1.3 + */ +public class PollenApplicationContext { + + /** Key to store the single instance of the application context */ + public static final String APPLICATION_CONTEXT_PARAMETER = + "pollenApplicationContext"; + + protected PollenConfiguration configuration; + + protected TopiaContext rootContext; + + protected PollenNotifierWorker pollenNotifierWorker; + + public static PollenApplicationContext get(ActionContext actionContext) { + Map<String, Object> application = actionContext.getApplication(); + PollenApplicationContext applicationContext = + (PollenApplicationContext) application.get(APPLICATION_CONTEXT_PARAMETER); + return applicationContext; + } + + public static PollenApplicationContext get(ServletContext servletContext) { + PollenApplicationContext applicationContext = + (PollenApplicationContext) servletContext.getAttribute(APPLICATION_CONTEXT_PARAMETER); + return applicationContext; + } + + public static void set(ServletContext servletContext, + PollenApplicationContext context) { + servletContext.setAttribute(APPLICATION_CONTEXT_PARAMETER, context); + } + + public static void set(ActionContext actionContext, + PollenApplicationContext context) { + Map<String, Object> application = actionContext.getApplication(); + if (context == null) { + + application.remove(APPLICATION_CONTEXT_PARAMETER); + } else { + + application.put(APPLICATION_CONTEXT_PARAMETER, context); + } + } + + public PollenConfiguration getConfiguration() { + return configuration; + } + + public void setConfiguration(PollenConfiguration configuration) { + this.configuration = configuration; + } + + public TopiaContext getRootContext() { + return rootContext; + } + + public void setRootContext(TopiaContext rootContext) { + this.rootContext = rootContext; + } + + public PollenNotifierWorker getPollenNotifierWorker() { + return pollenNotifierWorker; + } + + public void setPollenNotifierWorker(PollenNotifierWorker pollenNotifierWorker) { + this.pollenNotifierWorker = pollenNotifierWorker; + } +} Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -144,4 +143,4 @@ append("value", value). toString(); } -} \ No newline at end of file +} Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResultList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: Persistence - * + * Pollen :: Services * $Id$ * $HeadURL$ * %% @@ -38,30 +37,10 @@ */ public class PollenMigrationCallback extends TopiaMigrationCallbackByClassNG { -// public static final Version V_1_1 = VersionUtil.valueOf("1.1"); -// -// public static final Version V_1_2 = VersionUtil.valueOf("1.2"); -// -// public static final Version V_1_3 = VersionUtil.valueOf("1.3"); -// -// public static final Version V_1_3_1 = VersionUtil.valueOf("1.3.1"); -// -// public static final Version V_1_4 = VersionUtil.valueOf("1.4"); - -// /** Les versions de mise à jour disponibles. */ -// public static final Version[] AVAILABLE_VERSIONS = new Version[]{ -// V_1_1, V_1_2, V_1_3, V_1_3_1, V_1_4 -// }; - public PollenMigrationCallback() { super(new MigrationCallBackForVersionResolverByServiceLoader()); } -// @Override -// public Version[] getAvailableVersions() { -// return AVAILABLE_VERSIONS; -// } - @Override public Version getApplicationVersion() { return VersionUtil.valueOf(PollenDAOHelper.getModelVersion()); @@ -71,27 +50,4 @@ public boolean askUser(Version version, List<Version> versions) { return true; } - -// /** -// * Migration resolver for each version. -// * -// * @author tchemit <chemit@codelutin.com> -// * @since 1.0.1 -// */ -// public static class PollenMigrationCallBackForVersionResolver implements MigrationCallBackForVersionResolver { -// -// @Override -// public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { -// -// String fqn = PollenMigrationCallback.class.getName() + "V" + version.getValidName(); -// Class<?> klass; -// try { -// klass = Class.forName(fqn); -// } catch (ClassNotFoundException e) { -// throw new IllegalStateException( -// "Could not find migration class " + fqn, e); -// } -// return (Class<? extends MigrationCallBackForVersion>) klass; -// } -// } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: Persistence - * + * Pollen :: Services * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: Persistence - * + * Pollen :: Services * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: Persistence - * + * Pollen :: Services * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: Persistence - * + * Pollen :: Services * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-05 07:32:19 UTC (rev 3421) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: Persistence - * * + * Pollen :: Services * $Id$ * $HeadURL$ * %% @@ -23,9 +22,23 @@ */ package org.chorem.pollen.entities.migration; +import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenApplicationContext; +import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollAccountImpl; +import org.chorem.pollen.business.persistence.PollImpl; import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.business.persistence.VoteToChoiceImpl; +import org.chorem.pollen.services.DefaultPollenServiceContext; +import org.chorem.pollen.services.PollenServiceContext; +import org.chorem.pollen.services.PollenServiceFactory; +import org.chorem.pollen.services.impl.PollFeedService; +import org.chorem.pollen.services.impl.PollService; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -33,11 +46,14 @@ import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; +import java.io.File; +import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; +import java.util.Locale; /** * Migration for version {@code 1.4}. @@ -47,6 +63,10 @@ */ public class PollenMigrationCallbackV1_4 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenMigrationCallbackV1_4.class); + @Override public Version getVersion() { return VersionUtil.valueOf("1.4"); @@ -65,8 +85,145 @@ // add a flag to not generate results each time (http://chorem.org/issues/135) addResultUptodateToPoll(queries); + + // generate missing feed files + generateMissingPollFeedFiles(tx); + + // generate missing thumbs + generateMissingImageThumbs(tx); } + private void generateMissingImageThumbs(TopiaContextImplementor tx) throws TopiaException { + TopiaSQLQuery<Pair<String, String>> getAllImageChoicesQuery = new TopiaSQLQuery<Pair<String, String>>() { + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement ps = connection.prepareStatement("SELECT p.pollId, c.name FROM choice c, poll p WHERE c.poll = p.topiaid AND p.choicetype=2;"); + return ps; + } + + @Override + protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { + String pollId = set.getString(1); + String choiceName = set.getString(2); + return Pair.of(pollId, choiceName); + } + }; + + PollenServiceFactory serviceFactory = new PollenServiceFactory(); + + PollenApplicationContext applicationContext = PollenApplicationContext.get( + ActionContext.getContext()); + + PollenConfiguration configuration = + applicationContext.getConfiguration(); + + + PollenServiceContext sContext = DefaultPollenServiceContext.newContext( + Locale.getDefault(), + tx, + configuration, + serviceFactory + ); + + List<Pair<String, String>> choiceIds = + getAllImageChoicesQuery.findMultipleResult(tx); + + PollService service = sContext.newService(PollService.class); + + for (Pair<String, String> choiceId : choiceIds) { + + String pollId = choiceId.getLeft(); + String choiceName = choiceId.getRight(); + + File pollChoiceImageThumb = service.getPollChoiceImageFile( + pollId, choiceName, true); + + 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); + } + } + + } + } + + private void generateMissingPollFeedFiles(TopiaContextImplementor tx) throws TopiaException { + TopiaSQLQuery<Poll> getAllPollIdsQuery = new TopiaSQLQuery<Poll>() { + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement ps = connection.prepareStatement("SELECT p.pollId, p.title, p.description, c.votingId FROM poll p, PollAccount c WHERE p.creator = c.topiaId;"); + return ps; + } + + @Override + protected Poll prepareResult(ResultSet set) throws SQLException { + String pollId = set.getString(1); + String pollTitle = set.getString(2); + String pollDescription = set.getString(3); + String votingId = set.getString(4); + Poll poll = new PollImpl(); + poll.setPollId(pollId); + poll.setTitle(pollTitle); + poll.setDescription(pollDescription); + PollAccount pollAccount = new PollAccountImpl(); + pollAccount.setVotingId(votingId); + poll.setCreator(pollAccount); + return poll; + } + }; + + PollenServiceFactory serviceFactory = new PollenServiceFactory(); + + PollenApplicationContext applicationContext = PollenApplicationContext.get( + ActionContext.getContext()); + + PollenConfiguration configuration = + applicationContext.getConfiguration(); + + + PollenServiceContext sContext = DefaultPollenServiceContext.newContext( + Locale.getDefault(), + tx, + configuration, + serviceFactory + ); + + PollFeedService feedService = sContext.newService(PollFeedService.class); + + List<Poll> polls = getAllPollIdsQuery.findMultipleResult(tx); + + for (Poll poll : polls) { + + boolean feedExists = feedService.isFeedExists(poll); + if (!feedExists) { + + // creates feed file + + if (log.isInfoEnabled()) { + log.info("Create missing file " + + feedService.getFeedLocation(poll)); + } + + feedService.onPollCreated(poll); + } + + } + } + private void addResultUptodateToPoll(List<String> queries) { queries.add("ALTER TABLE poll ADD COLUMN " + Poll.PROPERTY_RESULT_UPTODATE + " boolean default false;"); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -101,6 +100,11 @@ } @Override + public boolean isCanSendEmail() { + return getApplicationURL() != null; + } + + @Override public <E extends PollenService> E newService(Class<E> clazz) { return serviceFactory.newService(clazz, this); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -25,11 +24,9 @@ import com.google.common.base.Preconditions; import org.chorem.pollen.PollenTechnicalException; -import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PreventRule; import org.chorem.pollen.services.impl.PollService; -import org.chorem.pollen.services.impl.PollUrlService; import org.chorem.pollen.services.impl.PreventRuleService; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; @@ -81,8 +78,6 @@ try { serviceContext.setTransaction(transaction); - PollUrlService pollUrlService = - serviceContext.newService(PollUrlService.class); PollService pollService = serviceContext.newService(PollService.class); PreventRuleService preventRuleService = @@ -93,11 +88,8 @@ for (Poll poll : polls) { - PollUrl pollVoteUrl = - pollUrlService.getPollVoteUrl(poll, false); + preventRuleService.onPollToRemind(poll); - preventRuleService.onPollToRemind(poll, pollVoteUrl); - } } finally { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -49,6 +48,8 @@ URL getApplicationURL(); + boolean isCanSendEmail(); + PollenConfiguration getConfiguration(); PollenServiceFactory getServiceFactory(); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -41,7 +40,6 @@ import org.chorem.pollen.services.PollenServiceSupport; import org.nuiton.util.StringUtil; -import java.net.URL; import java.util.List; import java.util.Locale; @@ -54,16 +52,16 @@ public void onUserCreated(UserAccount user) { - URL url = serviceContext.getApplicationURL(); + if (serviceContext.isCanSendEmail() && + StringUtil.isEmail(user.getEmail())) { - if (url != null && StringUtil.isEmail(user.getEmail())) { - Locale locale = getLocale(); String subject = l_(locale, "pollen.email.userRegister.subject", user.getLogin()); String content = l_(locale, "pollen.email.userRegister.content", user.getDisplayName(), - user.getLogin(), user.getPassword(), url); + user.getLogin(), user.getPassword(), + serviceContext.getApplicationURL()); PollenEmail pollenEmail = createPollenEmail(user.getEmail(), subject, @@ -75,17 +73,16 @@ public void onLostPassword(UserAccount user, String newPassword) { - URL url = serviceContext.getApplicationURL(); + if (serviceContext.isCanSendEmail()) { - if (url != null) { - Locale locale = getLocale(); String subject = l_(locale, "pollen.email.lostPassword.subject", user.getLogin()); String content = l_(locale, "pollen.email.lostPassword.content", user.getDisplayName(), - user.getLogin(), newPassword, url); + user.getLogin(), newPassword, + serviceContext.getApplicationURL()); PollenEmail pollenEmail = createPollenEmail(user.getEmail(), subject, @@ -95,16 +92,18 @@ } } - public void onVoteAdded(Poll poll, PollUrl voteURL, PollUrl modifURL) { + public void onVoteAdded(Poll poll) { - URL url = serviceContext.getApplicationURL(); + if (serviceContext.isCanSendEmail()) { - if (url != null) { - Locale locale = getLocale(); String pollTitle = poll.getTitle(); + PollUrlService urlService = newService(PollUrlService.class); + + PollUrl summaryUrl = urlService.getPollSummaryUrl(poll); + // Mail au créateur if (StringUtils.isNotEmpty(poll.getCreator().getEmail())) { @@ -114,27 +113,28 @@ String subject = l_(locale, "pollen.email.voteEmail.subject", pollTitle); String content = l_(locale, "pollen.email.voteEmail.content", - pollTitle, nbVotes, voteURL, modifURL); + pollTitle, nbVotes, summaryUrl); PollenEmail pollenEmail = createPollenEmail( poll.getCreator().getEmail(), subject, content); sendEmail(pollenEmail); } - } } - public void onPollCreated(Poll poll, PollUrl voteURL, PollUrl moderateUrl, PollUrl modifURL) { + public void onPollCreated(Poll poll) { - URL url = serviceContext.getApplicationURL(); + if (serviceContext.isCanSendEmail()) { - if (url != null) { - Locale locale = getLocale(); String pollTitle = poll.getTitle(); + PollUrlService urlService = newService(PollUrlService.class); + PollUrl summaryUrl = urlService.getPollSummaryUrl(poll); + PollUrl voteUrl = urlService.getPollVoteUrl(poll); + // Mail au créateur if (StringUtils.isNotEmpty(poll.getCreator().getEmail())) { @@ -143,13 +143,13 @@ subject = l_(locale, "pollen.email.createPoll.subject", pollTitle); content = l_(locale, "pollen.email.createPoll.content", - pollTitle, poll.getPollId(), voteURL, moderateUrl, modifURL); + pollTitle, poll.getPollId(), summaryUrl); } else { subject = l_(locale, "pollen.email.createRestrictedPoll.subject", pollTitle); content = l_(locale, "pollen.email.createRestrictedPoll.content", - pollTitle, moderateUrl, modifURL); + pollTitle, summaryUrl); } PollenEmail pollenEmail = createPollenEmail( @@ -162,14 +162,15 @@ List<PollAccount> votingPollAccounts = poll.getPollAccounts(false); if (CollectionUtils.isNotEmpty(votingPollAccounts)) { - String subject = l_(locale, "pollen.email.votingEmail.subject", - pollTitle); List<PollenEmail> emails = Lists.newArrayList(); for (PollAccount account : votingPollAccounts) { PollenEmail pollenEmail = - createVotingEmail(locale, pollTitle, account, voteURL); + createVotingEmail(locale, + pollTitle, + account, + voteUrl); emails.add(pollenEmail); } @@ -179,16 +180,17 @@ } } - public void onRestrictedPersonAdded(Poll poll, PollAccount account, PollUrl voteURL) { + public void onRestrictedPersonAdded(Poll poll, PollAccount account) { - URL url = serviceContext.getApplicationURL(); + if (serviceContext.isCanSendEmail()) { - if (url != null) { - Locale locale = getLocale(); String pollTitle = poll.getTitle(); + PollUrlService urlService = newService(PollUrlService.class); + PollUrl voteURL = urlService.getPollVoteUrl(poll); + PollenEmail pollenEmail = createVotingEmail(locale, pollTitle, account, voteURL); @@ -196,16 +198,17 @@ } } - public void onPollReminder(Poll poll, PollUrl voteURL) { + public void onPollReminder(Poll poll) { - URL url = serviceContext.getApplicationURL(); + if (serviceContext.isCanSendEmail()) { - if (url != null) { - Locale locale = getLocale(); String pollTitle = poll.getTitle(); + PollUrl voteURL = + newService(PollUrlService.class).getPollVoteUrl(poll); + // Mails aux votants qui n'ont toujours pas voté List<PollAccount> votingPollAccounts = poll.getPollAccounts(true); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -98,7 +97,7 @@ // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onAddComment(poll, commentCreated); + pollFeedService.onCommentAdded(poll, commentCreated); return commentCreated; } catch (TopiaException e) { @@ -126,7 +125,7 @@ // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onDeleteComment(poll, comment, reason); + pollFeedService.onCommentDeleted(poll, comment, reason); } catch (TopiaException e) { throw new PollenTechnicalException(e); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -23,6 +22,7 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.sun.syndication.feed.synd.SyndContent; import com.sun.syndication.feed.synd.SyndContentImpl; @@ -83,17 +83,22 @@ return result; } - public void onPollCreated(Poll poll, PollUrl pollVoteUrl) { + public void onPollCreated(Poll poll) { File file = getFeedLocation(poll); - String title = l_(getLocale(), "pollen.feed.pollTitle", poll.getTitle()); - String description = l_(getLocale(), "pollen.feed.pollDescription", poll.getDescription()); + String title = l_(getLocale(), "pollen.feed.pollTitle", + poll.getTitle()); + String description = l_(getLocale(), "pollen.feed.pollDescription", + poll.getDescription()); + + PollUrlService urlService = newService(PollUrlService.class); + PollUrl voteUrl = urlService.getPollVoteUrl(poll); try { SyndFeed feed = new SyndFeedImpl(); feed.setFeedType("atom_1.0"); feed.setTitle(title); - feed.setLink(pollVoteUrl.getUrl()); + feed.setLink(voteUrl.getUrl()); feed.setDescription(description); Writer writer = new FileWriter(file); @@ -111,47 +116,36 @@ String content = _("pollen.feed.createPollContent", poll.getDescription()); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } catch (Exception e) { throw new PollenTechnicalException("Could not create feed", e); } } - public void onAddComment(Poll poll, Comment comment) { + public void onCommentAdded(Poll poll, Comment comment) { - PollUrlService pollService = newService(PollUrlService.class); - PollUrl pollVoteUrl = pollService.getPollVoteUrl(poll, false); - - String title = _("pollen.feed.addCommentTitle", comment.getAuthor()); String content = _("pollen.feed.addCommentContent", comment.getText()); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } - public void onDeleteComment(Poll poll, Comment comment, String reason) { + public void onCommentDeleted(Poll poll, Comment comment, String reason) { - PollUrlService pollService = newService(PollUrlService.class); - PollUrl pollVoteUrl = pollService.getPollVoteUrl(poll, false); - String title = _("pollen.feed.deleteCommentTitle", comment.getAuthor(), reason); String content = _("pollen.feed.deleteCommentContent", comment.getText()); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } - public void onAddVote(Poll poll, Vote vote) { + public void onVoteAdded(Poll poll, Vote vote) { - PollUrlService pollUrlService = newService(PollUrlService.class); - - PollUrl pollVoteUrl = pollUrlService.getPollVoteUrl(poll, false); - PollResultsService pollResultsService = newService(PollResultsService.class); @@ -170,16 +164,11 @@ String content = _("pollen.feed.addVoteContent", pollResult); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } - public void onUpdateVote(Poll poll, - Vote vote) { + public void onVoteUpdated(Poll poll, Vote vote) { - PollUrlService pollUrlService = newService(PollUrlService.class); - - PollUrl pollVoteUrl = pollUrlService.getPollVoteUrl(poll, false); - PollResultsService pollResultsService = newService(PollResultsService.class); @@ -198,15 +187,12 @@ String content = _("pollen.feed.updateVoteContent", pollResult); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } - public void onDeleteVote(Poll poll, Vote vote, PollAccount voteAccount, String reason) { + public void onVoteDeleted(Poll poll, Vote vote, + PollAccount voteAccount, String reason) { - PollUrlService pollUrlService = newService(PollUrlService.class); - - PollUrl pollVoteUrl = pollUrlService.getPollVoteUrl(poll, false); - PollResultsService pollResultsService = newService(PollResultsService.class); @@ -223,17 +209,17 @@ String content = _("pollen.feed.deleteVoteContent", pollResult); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } - public void onAddChoice(Poll poll, Choice choice, PollUrl pollVoteUrl) { + public void onChoiceAdded(Poll poll, Choice choice) { String title = _("pollen.feed.addChoiceTitle", choice.getName()); String content = _("pollen.feed.addChoiceContent", choice.getDescription()); - addFeedEntry(poll, title, content, pollVoteUrl); + addFeedEntry(poll, title, content); } /** @@ -258,24 +244,20 @@ /** * Ajout d'une entrée dans un flux. * - * @param poll poll - * @param title titre de l'entrée - * @param content contenu de l'entrée - * @param pollVoteUrl poll vote url + * @param poll poll + * @param title titre de l'entrée + * @param content contenu de l'entrée */ - protected void addFeedEntry(Poll poll, - String title, - String content, - PollUrl pollVoteUrl) { + protected void addFeedEntry(Poll poll, String title, String content) { - //TODO tchemitshould remove this, may migrates when going to version 2.0 - //TODO pass on all polls from database and creates the feed if not found. - if (!isFeedExists(poll)) { - onPollCreated(poll, pollVoteUrl); - } - File file = getFeedLocation(poll); + Preconditions.checkState(isFeedExists(poll), + "Could not find feed for poll at " + file); + + PollUrlService urlService = newService(PollUrlService.class); + PollUrl voteUrl = urlService.getPollVoteUrl(poll); + try { List entries = Lists.newArrayList(); SyndFeedInput input = new SyndFeedInput(); @@ -286,7 +268,7 @@ SyndContent description; entry = new SyndEntryImpl(); entry.setTitle(title); - entry.setLink(pollVoteUrl.getUrl()); + entry.setLink(voteUrl.getUrl()); entry.setPublishedDate(new Date()); description = new SyndContentImpl(); description.setType("text/plain"); @@ -311,4 +293,5 @@ throw new PollenTechnicalException("Could not feed feed", e); } } + } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -37,8 +36,6 @@ import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.bean.PollDateChoice; import org.chorem.pollen.bean.PollImageChoice; -import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.ChoiceDAO; import org.chorem.pollen.business.persistence.PersonToList; @@ -53,7 +50,6 @@ import org.chorem.pollen.business.persistence.VotingList; import org.chorem.pollen.business.persistence.VotingListDAO; import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.PollType; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.PollenServiceSupport; @@ -242,26 +238,20 @@ commitTransaction("Could not create poll " + poll.getTitle()); - PollUrlService pollUrlService = newService(PollUrlService.class); - - PollUrl pollVoteUrl = pollUrlService.getPollVoteUrl(poll, false); - PollUrl pollModerateUrl = pollUrlService.getPollVoteUrl(poll, true); - PollUrl pollEditUrl = pollUrlService.getPollEditUrl(poll); - // email notification EmailService emailService = newService(EmailService.class); - emailService.onPollCreated(result, pollVoteUrl, pollModerateUrl, pollEditUrl); + emailService.onPollCreated(result); // feed notification // XXX-fdesbois-2012-04-12 : if the feed is the same for everybody maybe // not publish restricted poll that can't be accessed by everybody PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onPollCreated(result, pollVoteUrl); + pollFeedService.onPollCreated(result); return result; } - public void updatePoll(Poll poll) throws PollNotFoundException { + public Poll updatePoll(Poll poll) throws PollNotFoundException { Poll pollToUpdate = getEntityById(Poll.class, poll.getTopiaId()); @@ -319,6 +309,8 @@ } commitTransaction("Could not update poll [" + poll.getTopiaId() + "]"); + + return pollToUpdate; } public List<Poll> getPolls(TopiaFilterPagerUtil.FilterPagerBean pager) { @@ -861,81 +853,6 @@ commitTransaction("Could not delete choice " + choice.getName()); } - public void checkPoll(PollUri uri) throws PollNotFoundException { - - String pollId = uri.getPollId(); - - getExistingPollByPollId(pollId); - } - - public void checkPollResult(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { - - String pollId = uri.getPollId(); - - Poll poll = getExistingPollByPollId(pollId); - - if (!poll.isPublicResults()) { - throw new UnauthorizedPollAccessException(); - } - } - - public void checkPollAccount(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { - - String pollId = uri.getPollId(); - String accountId = uri.getAccountId(); - - Poll poll = getExistingPollByPollId(pollId); - - PollAccountDAO dao = getDAO(PollAccount.class); - - if (poll.getPollType() != PollType.FREE) { - - // check that uri contains a correct poll account for this - - // Use PersonToList association entity to find coherence between - // the poll and votingId - - try { - PollAccount result = - dao.getRestrictedPollAccount(pollId, accountId); - - if (result == null) { - throw new UnauthorizedPollAccessException(); - } - } catch (TopiaException e) { - throw new PollenTechnicalException( - "Could not obtain restricted pollAccount", e); - } - - } else if (accountId != null) { - - try { - - if (!dao.existsByPollVoteAccountId(pollId, accountId)) { - throw new UnauthorizedPollAccessException(); - } - } catch (TopiaException e) { - throw new PollenTechnicalException( - "Could not check pollAccount existence from poll '" + - pollId + "' and account '" + accountId + "'", e); - } - } - } - - public void checkPollCreator(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { - - String pollId = uri.getPollId(); - String accountId = uri.getAccountId(); - - Poll poll = getExistingPollByPollId(pollId); - - String creatorId = poll.getCreator().getAccountId(); - - if (!creatorId.equals(accountId)) { - throw new UnauthorizedPollAccessException(); - } - } - public File getPollChoiceImageFile(String pollId, String choiceId, boolean thumb) { @@ -960,16 +877,48 @@ */ public void saveImages(Poll poll, PollImageChoice choice) throws IOException { - String location = choice.getLocation(); - String pollId = poll.getPollId(); String name = choice.getName(); + generateThumb(pollId, name, choice); + } + + public void generateThumb(String pollId, + String name, + PollImageChoice choice) throws IOException { + File pollChoiceImage = getPollChoiceImageFile(pollId, name, false); File pollChoiceImageThumb = getPollChoiceImageFile(pollId, name, true); - FileUtils.copyFile(new File(location), pollChoiceImage); - createThumbnail(pollChoiceImage, pollChoiceImageThumb, 100); + if (choice != null) { + + // means must copy it + + + String location = choice.getLocation(); + + 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); + + 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); + + ImageIO.write(thumbImage, "jpg", pollChoiceImageThumb); + + if (log.isDebugEnabled()) { + log.debug("Thumbnail created: " + pollChoiceImageThumb.getName() + " (size=" + + pollChoiceImageThumb.length() + ")"); + } } public PersonToList getNewPersonToList(PollAccount pollAccount) { @@ -1010,10 +959,6 @@ result.setName(votingList.getName()); result.setWeight(votingList.getWeight()); - PollUrlService pollUrlService = newService(PollUrlService.class); - - PollUrl voteURL = pollUrlService.getPollVoteUrl(poll, false); - // Merge PersonToList List<PersonToList> personToListsUpdated = Lists.newArrayList(); for (PersonToList personToList : votingList.getPollAccountPersonToList()) { @@ -1062,7 +1007,7 @@ // Send email to the person if service is defined and email has changed if (emailService != null && emailChanged) { - emailService.onRestrictedPersonAdded(poll, pollAccountLoaded, voteURL); + emailService.onRestrictedPersonAdded(poll, pollAccountLoaded); } // Update the account (otherwise a saving error will occurs if Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -26,6 +26,7 @@ import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollActions; import org.chorem.pollen.services.PollenServiceSupport; import java.net.URL; @@ -38,50 +39,56 @@ */ public class PollUrlService extends PollenServiceSupport { - public PollUrl getPollVoteUrl(Poll poll, boolean moderate) { + public PollUrl getPollSummaryUrl(Poll poll) { - Preconditions.checkNotNull(poll); + PollUrl result = newPollUri(PollActions.SUMMARY, poll, true); + return result; + } - URL applicationUrl = serviceContext.getApplicationURL(); - String baseUrl = applicationUrl + "/poll/votefor/"; - PollUri pollUri = PollUri.newPollUri(poll.getPollId()); + public PollUrl getPollCloneUrl(Poll poll) { - if (moderate) { - String creatorId = poll.getCreator().getAccountId(); - pollUri.setAccountId(creatorId); - } - - PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); + PollUrl result = newPollUri(PollActions.CLONE, poll, true); return result; } - public PollUrl getPollEditUrl(Poll poll) { + public PollUrl getPollExportUrl(Poll poll) { - Preconditions.checkNotNull(poll); + PollUrl result = newPollUri(PollActions.EXPORT, poll, true); + return result; + } - URL applicationUrl = serviceContext.getApplicationURL(); - String baseUrl = applicationUrl + "/poll/modification/"; + public PollUrl getPollVoteUrl(Poll poll) { + PollUrl result = newPollUri(PollActions.VOTE, poll, false); + return result; + } - String creatorId = poll.getCreator().getAccountId(); - PollUri pollUri = PollUri.newPollUri(poll.getPollId(), creatorId); + public PollUrl getPollModerateUrl(Poll poll) { + PollUrl result = newPollUri(PollActions.MODERATE, poll, true); + return result; + } - PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); + public PollUrl getPollEditUrl(Poll poll) { + PollUrl result = newPollUri(PollActions.EDIT, poll, true); return result; } public PollUrl getPollResultUrl(Poll poll) { + PollUrl result = newPollUri(PollActions.RESULT, poll, + !poll.isPublicResults()); + return result; + } + protected PollUrl newPollUri(PollActions action, Poll poll, boolean admin) { + Preconditions.checkNotNull(poll); + Preconditions.checkNotNull(action); + String prefix = '/' + action.getActionPrefix() + '/'; + URL applicationUrl = serviceContext.getApplicationURL(); - String baseUrl = applicationUrl + "/poll/results/"; - PollUri pollUri = PollUri.newPollUri(poll.getPollId()); - - if (!poll.isPublicResults()) { - String creatorId = poll.getCreator().getAccountId(); - pollUri.setAccountId(creatorId); - } - + String baseUrl = applicationUrl + prefix; + PollUri pollUri = PollUri.newPollUri( + admin ? poll.getAdminId() : poll.getPollId()); PollUrl result = PollUrl.newPollUrl(baseUrl, pollUri); return result; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -26,7 +25,6 @@ import com.google.common.base.Preconditions; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PreventRule; import org.chorem.pollen.services.PollenServiceSupport; @@ -64,21 +62,17 @@ return rule; } - public void onVoteAdded(Poll poll, PollUrl pollVoteUrl, PollUrl modifURL) { + public void onVoteAdded(Poll poll) { if (poll.getEndDate() != null) { for (PreventRule rule : poll.getPreventRule()) { - onVoteAdded(poll, - rule, - pollVoteUrl, - modifURL - ); + onVoteAdded(poll, rule); } } } - public void onPollToRemind(Poll poll, PollUrl pollVoteUrl) { + public void onPollToRemind(Poll poll) { // Parcours des preventRules de chaque sondage // envoi d'un email si endDate-nowDate <= preventRuleSensibility @@ -99,19 +93,12 @@ for (PreventRule rule : poll.getPreventRule()) { - onPollToRemind(poll, - rule, - pollVoteUrl, - hourBeforeEnd - ); + onPollToRemind(poll, rule, hourBeforeEnd); } } } - protected void onVoteAdded(Poll poll, - PreventRule preventRule, - PollUrl pollVoteUrl, - PollUrl modifURL) { + protected void onVoteAdded(Poll poll, PreventRule preventRule) { // send to creator a email to say hey a new vote was added! @@ -122,16 +109,14 @@ EmailService emailService = newService(EmailService.class); // let's send an email - emailService.onVoteAdded(poll, pollVoteUrl, modifURL); + emailService.onVoteAdded(poll); // and update prevent rule commitTransaction("Could not update prevent rule"); } } - protected void onPollToRemind(Poll poll, - PreventRule preventRule, - PollUrl pollVoteUrl, + protected void onPollToRemind(Poll poll, PreventRule preventRule, int timeValue) { // send to all voting a email to say hey we need to vote @@ -143,15 +128,14 @@ EmailService emailService = newService(EmailService.class); // let's send an email - emailService.onPollReminder(poll, pollVoteUrl); + emailService.onPollReminder(poll); // and update prevent rule commitTransaction("Could not update prevent rule"); } } - protected boolean execute(String scope, - PreventRule preventRule, + protected boolean execute(String scope, PreventRule preventRule, Integer value) { Preconditions.checkNotNull(scope); Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,125 @@ +/* + * #%L + * Pollen :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.bean.PollUri; +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.common.PollType; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.PollNotFoundException; +import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; +import org.nuiton.topia.TopiaException; + +/** + * Service to manager security. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.4 + */ +public class SecurityService extends PollenServiceSupport { + + public void checkPoll(PollUri uri) throws PollNotFoundException { + + getExistingPoll(uri); + } + + public void checkPollResult(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { + + Poll poll = getExistingPoll(uri); + + if (!poll.isPublicResults()) { + throw new UnauthorizedPollAccessException(); + } + } + + public void checkPollAccount(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { + + + String accountId = uri.getAccountId(); + + Poll poll = getExistingPoll(uri); + + PollAccountDAO dao = getDAO(PollAccount.class); + + String pollId = uri.getPollId(); + + if (poll.getPollType() == PollType.FREE) { + + // free poll + if (accountId != null) { + + // account Id is given check there is a such vote for this account + + try { + + if (!dao.existsByPollVoteAccountId(pollId, accountId)) { + throw new UnauthorizedPollAccessException(); + } + } catch (TopiaException e) { + throw new PollenTechnicalException( + "Could not check pollAccount existence from poll '" + + pollId + "' and account '" + accountId + "'", e); + } + } + } else { + + // check that uri contains a correct poll account for this + + // Use PersonToList association entity to find coherence between + // the poll and votingId + + try { + PollAccount result = + dao.getRestrictedPollAccount(pollId, accountId); + + if (result == null) { + throw new UnauthorizedPollAccessException(); + } + } catch (TopiaException e) { + throw new PollenTechnicalException( + "Could not obtain restricted pollAccount", e); + } + + } + } + + public void checkPollCreator(PollUri uri) throws PollNotFoundException, UnauthorizedPollAccessException { + + String accountId = uri.getAccountId(); + + Poll poll = getExistingPoll(uri); + + String creatorId = poll.getCreator().getAccountId(); + + if (!creatorId.equals(accountId)) { + throw new UnauthorizedPollAccessException(); + } + } + + protected Poll getExistingPoll(PollUri uri) throws PollNotFoundException { + return newService(PollService.class).getExistingPollByPollId(uri.getPollId()); + } +} Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -29,7 +28,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; -import org.chorem.pollen.bean.PollUrl; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.business.persistence.PersonToList; import org.chorem.pollen.business.persistence.PersonToListDAO; @@ -139,20 +137,6 @@ return result; } -// /** -// * Retrieve the URL to update a vote based on {@link PollUri}. -// * -// * @param pollUri Uri with pollId and accountId -// * @return the URL that allow the voting person to update his vote -// */ -// public String getUpdateVoteUrl(PollUri pollUri) { -// Preconditions.checkNotNull(pollUri.getAccountId()); -// URL baseUrl = serviceContext.getApplicationURL(); -// String result = -// String.format("%s/poll/votefor/%s", baseUrl, pollUri.getUri()); -// return result; -// } - public Vote createVote(Poll poll, Vote vote) throws PollAccountNotFound { VoteDAO voteDAO = getDAO(Vote.class); @@ -166,15 +150,17 @@ String pollAccountId = pollAccount.getTopiaId(); PollAccount pollAccountLoaded; - // Load existing account (restricted poll) - if (pollAccountId != null) { - pollAccountLoaded = getEntityById(PollAccount.class, pollAccountId); + if (pollAccountId == null) { + // Create new account - } else { PollAccountDAO pollAccountDAO = getDAO(PollAccount.class); pollAccountLoaded = create(pollAccountDAO); pollAccountLoaded.setAccountId(pollAccount.getAccountId()); + } else { + + // Load existing account (restricted poll) + pollAccountLoaded = getEntityById(PollAccount.class, pollAccountId); } // Update user data if not anonymous @@ -185,7 +171,8 @@ UserAccount userAccount = pollAccount.getUserAccount(); if (userAccount != null) { - UserAccount userAccountLoaded = getEntityById(UserAccount.class, userAccount.getTopiaId()); + UserAccount userAccountLoaded = + getEntityById(UserAccount.class, userAccount.getTopiaId()); pollAccountLoaded.setUserAccount(userAccountLoaded); } } @@ -222,19 +209,14 @@ commitTransaction("Could not create vote"); - PollUrlService pollUrlService = newService(PollUrlService.class); - - PollUrl pollVoteUrl = pollUrlService.getPollVoteUrl(poll, false); - // Send notification if necessary PreventRuleService preventRuleService = newService(PreventRuleService.class); - PollUrl modifUrl = pollUrlService.getPollEditUrl(poll); - preventRuleService.onVoteAdded(poll, pollVoteUrl, modifUrl); + preventRuleService.onVoteAdded(poll); // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onAddVote(pollToUpdate, result); + pollFeedService.onVoteAdded(pollToUpdate, result); return result; } @@ -269,7 +251,8 @@ Integer value = input.getVoteValue(); - VoteToChoice voteToChoiceEntity = result.getChoiceVoteToChoice(input.getChoice()); + VoteToChoice voteToChoiceEntity = + result.getChoiceVoteToChoice(input.getChoice()); if (value != null) { if (voteToChoiceEntity != null) { @@ -296,7 +279,7 @@ // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onUpdateVote(poll, result); + pollFeedService.onVoteUpdated(poll, result); return result; } @@ -365,7 +348,7 @@ // feed notification PollFeedService pollFeedService = newService(PollFeedService.class); - pollFeedService.onDeleteVote(poll, entityToDelete, voteAccount, reason); + pollFeedService.onVoteDeleted(poll, entityToDelete, voteAccount, reason); } public List<Vote> getVotesByPoll(Poll poll, @@ -411,8 +394,9 @@ result = poll.isRunning(now); if (poll.getPollType() != PollType.FREE) { - PersonToListDAO personToListDAO = getDAO(PersonToList.class); - PersonToList personToList = personToListDAO.findByPollAndAccount(poll, accountEditable); + PersonToListDAO dao = getDAO(PersonToList.class); + PersonToList personToList = + dao.findByPollAndAccount(poll, accountEditable); result &= personToList != null; } @@ -420,7 +404,8 @@ return result; } - public boolean isUpdateAllowed(Poll poll, String voteId, String accountId, UserAccount userConnected) { + public boolean isUpdateAllowed(Poll poll, String voteId, + String accountId, UserAccount userConnected) { Date now = serviceContext.getCurrentTime(); Copied: trunk/pollen-services/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion (from rev 3421, trunk/pollen-persistence/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion) =================================================================== --- trunk/pollen-services/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion (rev 0) +++ trunk/pollen-services/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,5 @@ +org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_1 +org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_2 +org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_3 +org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_3_1 +org.chorem.pollen.entities.migration.PollenMigrationCallbackV1_4 \ No newline at end of file Property changes on: trunk/pollen-services/src/main/resources/META-INF/services/org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG$MigrationCallBackForVersion ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -11,9 +11,9 @@ pollen.common.numberVote-total-votes=Total votes pollen.common.unauthorized=unauthorized pollen.common.undefined=undefined -pollen.email.createPoll.content=You had just created the new poll\: "%s" (id %s).\n\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nModerate votes page\: \n%s\nEdit page\: \n%s +pollen.email.createPoll.content=You had just created the new poll\: "%s" (id %s).\n\nYou can access to this poll on this link\:\n\n%s pollen.email.createPoll.subject=[Pollen] Poll creation (%s) -pollen.email.createRestrictedPoll.content=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nModerate votes page\: \n%s\nEdit page\: \n%s +pollen.email.createRestrictedPoll.content=You had just created the new poll\: "%s".\nYou can access to this poll on this link\:\n\n%s pollen.email.createRestrictedPoll.subject=[Pollen] Restricted poll creation (%s) pollen.email.lostPassword.content=Hello %1$s. You have just asked for a new password generation for your Pollen account.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s pollen.email.lostPassword.subject=[Pollen] Lost password for %s @@ -21,7 +21,7 @@ pollen.email.reminderEmail.subject=[Pollen] Reminder (%s) pollen.email.userRegister.content=Welcome %1$s. You had just created an account on the web application Pollen.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s pollen.email.userRegister.subject=[Pollen] Confirmation of account creation %s -pollen.email.voteEmail.content=A vote has been submitted for the poll "%s". There are now %d votes for this poll.\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s +pollen.email.voteEmail.content=A vote has been submitted for the poll "%s". There are now %d votes for this poll.\nYou can access to this poll on this link\:\n\n%s pollen.email.voteEmail.subject=[Pollen] Vote reporting (%s) pollen.email.votingEmail.content=A new poll has been created\: "%s".\nYou can participate with the identifier %s by following this link\: \n%s pollen.email.votingEmail.subject=[Pollen] Invitation to vote (%s) 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -11,9 +11,9 @@ 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\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%3$s\nModération des votes \: \n%4$s\nPage de modification \: \n%5$s +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.subject=[Pollen] Création d'un sondage (%1$s) -pollen.email.createRestrictedPoll.content=Vous venez de créer le sondage "%s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nModération des votes \: \n%s\nPage de modification \: \n%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) pollen.email.lostPassword.content=Bonjour %1$s. Vous venez de demander la génération d'un nouveau mot de passe d'accès à votre compte Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s pollen.email.lostPassword.subject=[Pollen] Mot de passe perdu du compte %s @@ -21,7 +21,7 @@ pollen.email.reminderEmail.subject=[Pollen] Rappel (%s) pollen.email.userRegister.content=Bienvenue %1$s. Vous venez de créer un compte sur l'application de sondage en ligne Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s pollen.email.userRegister.subject=[Pollen] Confirmation de création du compte %s -pollen.email.voteEmail.content=Un vote vient d'être enregistré pour le sondage "%s". Ce sondage compte désormais %d votes.\nVous pouvez accéder à ce sondage en suivant les liens ci-dessous.\n\nPage de vote \: \n%s\nPage de modification \: \n%s +pollen.email.voteEmail.content=Un vote vient d'être enregistré pour le sondage "%s". Ce sondage compte désormais %d votes.\nRetrouvez tous les liens pour y accéder sur cette page \:\n\n%s pollen.email.voteEmail.subject=[Pollen] Notification de vote (%s) pollen.email.votingEmail.content=Un nouveau sondage a été créé \: "%s".\nVous pouvez y participer avec l'identifiant %s à l'adresse suivante \: \n%s pollen.email.votingEmail.subject=[Pollen] Invitation au vote (%s) Modified: trunk/pollen-services/src/site/site_en.xml =================================================================== --- trunk/pollen-services/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - - $Id: site_en.xml 3394 2012-05-28 15:27:04Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/site/site_en.xm... $ + Pollen :: Services + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Property changes on: trunk/pollen-services/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/site/site_fr.xml =================================================================== --- trunk/pollen-services/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - - $Id: site_fr.xml 3394 2012-05-28 15:27:04Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/site/site_fr.xm... $ + Pollen :: Services + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Property changes on: trunk/pollen-services/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% @@ -151,6 +150,11 @@ return applicationUrl; } + @Override + public boolean isCanSendEmail() { + return true; + } + public void setApplicationUrl(URL applicationUrl) { this.applicationUrl = applicationUrl; } Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Services - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-services/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-services/src/test/resources/log4j.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/resources/log4j.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Services -# # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-services/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-services/src/test/resources/pollen-fake.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-services/src/test/resources/pollen-fake.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Services -# # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L Pollen :: UI (struts2) - $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/assembly/dist/pollen.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: UI (struts2) -# # $Id$ # $HeadURL$ # %% Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,91 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui; - -import com.opensymphony.xwork2.ActionContext; -import org.chorem.pollen.PollenConfiguration; -import org.chorem.pollen.services.PollenNotifierWorker; -import org.nuiton.topia.TopiaContext; - -import javax.servlet.ServletContext; -import java.util.Map; - -/** - * @author tchemit <chemit@codelutin.com> - * @since 1.3 - */ -public class PollenApplicationContext { - - /** Key to store the single instance of the application context */ - public static final String APPLICATION_CONTEXT_PARAMETER = - "pollenApplicationContext"; - - protected PollenConfiguration configuration; - - protected TopiaContext rootContext; - - protected PollenNotifierWorker pollenNotifierWorker; - - public static PollenApplicationContext get(ActionContext actionContext) { - Map<String, Object> application = actionContext.getApplication(); - PollenApplicationContext applicationContext = - (PollenApplicationContext) application.get(APPLICATION_CONTEXT_PARAMETER); - return applicationContext; - } - - public static PollenApplicationContext get(ServletContext servletContext) { - PollenApplicationContext applicationContext = - (PollenApplicationContext) servletContext.getAttribute(APPLICATION_CONTEXT_PARAMETER); - return applicationContext; - } - - public static void set(ServletContext servletContext, - PollenApplicationContext context) { - servletContext.setAttribute(APPLICATION_CONTEXT_PARAMETER, context); - } - - public PollenConfiguration getConfiguration() { - return configuration; - } - - public void setConfiguration(PollenConfiguration configuration) { - this.configuration = configuration; - } - - public TopiaContext getRootContext() { - return rootContext; - } - - public void setRootContext(TopiaContext rootContext) { - this.rootContext = rootContext; - } - - public PollenNotifierWorker getPollenNotifierWorker() { - return pollenNotifierWorker; - } - - public void setPollenNotifierWorker(PollenNotifierWorker pollenNotifierWorker) { - this.pollenNotifierWorker = pollenNotifierWorker; - } -} 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -23,8 +22,11 @@ */ package org.chorem.pollen.ui; +import com.google.common.collect.Maps; +import com.opensymphony.xwork2.ActionContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.PollenTopiaRootContextFactory; @@ -46,6 +48,7 @@ import java.io.IOException; import java.util.Date; import java.util.Locale; +import java.util.Map; /** * To listen start or end of the application. @@ -93,18 +96,28 @@ if (log.isInfoEnabled()) { log.info("Initializing RootContext..."); } - PollenTopiaRootContextFactory factory = - new PollenTopiaRootContextFactory(); - TopiaContext rootContext - = factory.newDatabaseFromConfig(configuration); - applicationContext.setRootContext(rootContext); + Map<String, Object> map = Maps.newHashMap(); + map.put(ActionContext.APPLICATION, Maps.newHashMap()); + ActionContext actionContext = new ActionContext(map); + ActionContext.setContext(actionContext); + PollenApplicationContext.set(actionContext, applicationContext); + // init db try { + + TopiaContext rootContext + = new PollenTopiaRootContextFactory().newDatabaseFromConfig(configuration); + applicationContext.setRootContext(rootContext); + + initDB(applicationContext); } catch (TopiaException e) { throw new PollenTechnicalException("Could not init db", e); + } finally { + ActionContext.setContext(null); + PollenApplicationContext.set(actionContext, null); } // int pollen notifier worker @@ -187,6 +200,8 @@ protected void initDB(PollenApplicationContext applicationContext) throws TopiaException { + ActionContext context = ActionContext.getContext(); + PollenApplicationContext.set(context, applicationContext); TopiaContext rootContext = applicationContext.getRootContext(); boolean schemaFound = TopiaUtil.isSchemaExist( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -25,6 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenApplicationContext; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -42,9 +41,10 @@ import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.services.impl.PollUrlService; import org.chorem.pollen.services.impl.PreventRuleService; +import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.services.impl.VoteService; -import org.chorem.pollen.ui.PollenApplicationContext; +import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.ui.PollenSession; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaTransactionAware; @@ -115,6 +115,8 @@ private transient PreventRuleService preventRuleService; + private transient SecurityService securityService; + public PageSkin getSkin() { return PageSkin.INDEX; } @@ -382,4 +384,11 @@ } return preventRuleService; } + + public SecurityService getSecurityService() { + if (securityService == null) { + securityService = newService(SecurityService.class); + } + return securityService; + } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -87,8 +86,6 @@ Map<String, Object> map = pollService.pollToMap(poll, binder); map.put("voteId", poll.getPollId()); - map.put("moderateId", poll.getAdminId()); - map.put("resultId", getResultId(poll)); map.put("adminId", poll.getAdminId()); Set<String> functions = getPollFunctions(poll); map.put("functions", functions); @@ -103,37 +100,40 @@ // only free poll could have vote action because creator can't vote result.add("vote"); + } else { + // to be sure a blank image is setted instead of vote picto + result.add("novote"); } - result.add("moderate"); - result.add("result"); - if (!poll.isClosed()) { - - // poll is not closed - result.add("edit"); - result.add("close"); - } - result.add("export"); - result.add("clone"); + 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; - } -} \ No newline at end of file +// /** +// * 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/GetFavoriteList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -67,4 +66,4 @@ return SUCCESS; } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -73,4 +72,4 @@ return SUCCESS; } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -106,4 +105,4 @@ return SUCCESS; } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -84,4 +83,4 @@ return SUCCESS; } -} \ No newline at end of file +} 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -88,21 +87,11 @@ Poll poll = entry.getKey(); Map<String, Object> map = pollService.pollToMap(poll, binder); -// Map<String, Object> map = binder.obtainProperties( -// poll, -// Poll.PROPERTY_TITLE, -// Poll.PROPERTY_POLL_ID, -// Poll.PROPERTY_DESCRIPTION, -// Poll.PROPERTY_BEGIN_DATE, -// Poll.PROPERTY_END_DATE -// ); - PollAccount account = entry.getValue(); PollUri pollUri = PollUri.newPollUri(poll.getPollId(), account.getAccountId()); -// map.put("id", poll.getTopiaId()); map.put("voteId", pollUri.getUri()); map.put("resultId", pollUri.getUri()); @@ -123,4 +112,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -89,23 +88,11 @@ Poll poll = entry.getKey(); Map<String, Object> map = pollService.pollToMap(poll, binder); - -// Map<String, Object> map = binder.obtainProperties( -// poll, -// Poll.PROPERTY_TITLE, -// Poll.PROPERTY_POLL_ID, -// Poll.PROPERTY_DESCRIPTION, -// Poll.PROPERTY_BEGIN_DATE, -// Poll.PROPERTY_END_DATE -// ); - PollAccount account = entry.getValue(); PollUri pollUri = PollUri.newPollUri(poll.getPollId(), account.getAccountId()); -// map.put("id", poll.getTopiaId()); - // Keep accountId to allow vote update map.put("voteId", pollUri.getUri()); @@ -132,4 +119,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPollComments.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -121,4 +120,4 @@ } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -84,8 +83,6 @@ Map<String, Object> map = pollService.pollToMap(poll, binder); - map.put("moderateId", poll.getAdminId()); - map.put("resultId", poll.getAdminId()); map.put("adminId", poll.getAdminId()); Set<String> functions = getPollFunctions(poll); @@ -98,16 +95,16 @@ protected Set<String> getPollFunctions(Poll poll) { Set<String> result = Sets.newHashSet(); - result.add("moderate"); - result.add("result"); - if (!poll.isClosed()) { - - // poll is not closed - result.add("edit"); - result.add("close"); - } - result.add("export"); - result.add("clone"); + 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; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractDisplayChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollUriIdAction.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -462,4 +461,4 @@ } } } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddComment.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ClosePoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteComment.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -71,4 +70,4 @@ return SUCCESS; } -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmDeleteVote.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ConfirmPollAction.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteComment.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeletePoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DeleteVote.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayDateChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayImageChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPersonToList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayTextChoice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayVotingList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/EditVote.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ExportPoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ImportPersonListToVotingList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/InvitedList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultLink.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,84 +0,0 @@ -/* - * #%L - * Pollen :: UI (struts2) - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import com.google.common.base.Preconditions; -import org.chorem.pollen.business.persistence.Poll; -import org.chorem.pollen.common.PollType; -import org.chorem.pollen.ui.actions.PageSkin; - -/** - * Action to display all resume link for a given poll. - * - * @author tchemit <chemit@codelutin.com> - * @since 1.4 - */ -public class ResumePoll extends AbstractPollUriIdAction { - - private static final long serialVersionUID = 1L; - - /** - * Loade poll. - * - * @since 1.4 - */ - private Poll poll; - - public Poll getPoll() { - return poll; - } - - @Override - public PageSkin getSkin() { - return PageSkin.EDITION; - } - - public String getPollVoteUrl() { - return getPollUrlService().getPollVoteUrl(poll, false).getUrl(); - } - - public String getPollModerateUrl() { - return getPollUrlService().getPollVoteUrl(poll, true).getUrl(); - } - - public String getPollEditUrl() { - return getPollUrlService().getPollEditUrl(poll).getUrl(); - } - - public boolean isFreePoll() { - PollType pollType = poll.getPollType(); - return pollType == PollType.FREE; - } - - @Override - public String execute() throws Exception { - - Preconditions.checkNotNull(getUriId()); - - String pollId = getUriId().getPollId(); - - poll = getPollService().getExistingPollByPollId(pollId); - - return SUCCESS; - } -} 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -306,7 +305,7 @@ _("pollen.information.poll.updated", poll.getTitle())); } else { - getPollService().createPoll(poll); + poll = getPollService().createPoll(poll); addFlashMessage( _("pollen.information.poll.created", poll.getTitle())); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SelectPersonListToVotingList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Copied: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java (from rev 3421, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResumePoll.java) =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,116 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.ui.actions.PageSkin; + +/** + * Action to display summary of a poll for his creator (or an admin). + * + * @author tchemit <chemit@codelutin.com> + * @since 1.4 + */ +public class SummaryPoll extends AbstractPollUriIdAction { + + private static final long serialVersionUID = 1L; + + /** + * Loaded poll. + * + * @since 1.4 + */ + private Poll poll; + + public Poll getPoll() { + return poll; + } + + @Override + public PageSkin getSkin() { + return PageSkin.EDITION; + } + + public String getVoteUrl() { + return getPollUrlService().getPollVoteUrl(poll).getUrl(); + } + + public String getModerateUrl() { + return getPollUrlService().getPollModerateUrl(poll).getUrl(); + } + + public String getEditUrl() { + return getPollUrlService().getPollEditUrl(poll).getUrl(); + } + + public String getCloneUrl() { + return getPollUrlService().getPollCloneUrl(poll).getUrl(); + } + + public String getExportUrl() { + return getPollUrlService().getPollExportUrl(poll).getUrl(); + } + + public String getResultUrl() { + return getPollUrlService().getPollResultUrl(poll).getUrl(); + } + + public boolean isCanClose() { + return !poll.isClosed(); + } + + public boolean isCanShowResult() { + return poll.isPublicResults(); + } + + public boolean isCanVote() { + //FIXME-tchemit-2012-06-05 Should check that creator can vote instead + PollType pollType = poll.getPollType(); + return pollType == PollType.FREE; + +// boolean result; +// try { +// getSecurityService().checkPollAccount(getUriId()); +// result = true; +// } catch (PollNotFoundException e) { +// result = false; +// } catch (UnauthorizedPollAccessException e) { +// result = false; +// } +// return result; + } + + @Override + public String execute() throws Exception { + + Preconditions.checkNotNull(getUriId()); + + String pollId = getUriId().getPollId(); + + poll = getPollService().getExistingPollByPollId(pollId); + + return SUCCESS; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SummaryPoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -156,9 +155,8 @@ String pollId = poll.getPollId(); String accountId = getPollAccount().getAccountId(); -// PollUri pollUri = PollUri.newPollUri(pollId, accountId); - PollUrl updateUrl = getPollUrlService().getPollVoteUrl(poll, true); + PollUrl updateUrl = getPollUrlService().getPollModerateUrl(poll); if (log.isDebugEnabled()) { log.debug(String.format( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeletePollAccount.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/PollenServletActionRedirectResult.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -34,7 +33,8 @@ import org.chorem.pollen.services.DefaultPollenServiceContext; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.PollenServiceFactory; -import org.chorem.pollen.ui.PollenApplicationContext; +import org.chorem.pollen.services.impl.SecurityService; +import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.ui.PollenSession; import org.chorem.pollen.ui.PollenUIUtils; import org.nuiton.topia.TopiaContext; @@ -99,7 +99,15 @@ return result; } - protected UserAccount getPollenUSerAccount(ServletRequest request) { + protected SecurityService getSecurityService(ServletRequest request) { + PollenServiceContext serviceContext = getServiceContext(request); + + SecurityService securityService = + serviceContext.newService(SecurityService.class); + return securityService; + } + + protected UserAccount getPollenUserAccount(ServletRequest request) { PollenSession pollenSession = PollenSession.get(request); return pollenSession.getUserAccount(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AdminUserRequired.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -40,7 +39,7 @@ ServletResponse response, Object mappedValue) { - UserAccount userAccount = getPollenUSerAccount(request); + UserAccount userAccount = getPollenUserAccount(request); boolean isAccessAllowed = userAccount != null && userAccount.isAdministrator(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ConnectedUserRequired.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollAccessRequired.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -26,10 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; -import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.services.impl.SecurityService; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -76,14 +74,11 @@ } else { - PollenServiceContext serviceContext = - getServiceContext(request); - PollService pollService = - serviceContext.newService(PollService.class); + SecurityService securityService = getSecurityService(request); try { - pollService.checkPollAccount(pollUri); + securityService.checkPollAccount(pollUri); isAccessAllowed = true; if (log.isDebugEnabled()) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorRequired.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -26,10 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; -import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.services.impl.SecurityService; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -67,14 +65,10 @@ } else { - PollenServiceContext serviceContext = - getServiceContext(request); + SecurityService securityService = getSecurityService(request); - PollService pollService = - serviceContext.newService(PollService.class); - try { - pollService.checkPollCreator(pollUri); + securityService.checkPollCreator(pollUri); isAccessAllowed = true; if (log.isDebugEnabled()) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollRequired.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -26,9 +25,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.exceptions.PollNotFoundException; -import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.services.impl.SecurityService; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -54,13 +52,10 @@ } else { - PollenServiceContext serviceContext = getServiceContext(request); + SecurityService securityService = getSecurityService(request); - PollService pollService = - serviceContext.newService(PollService.class); - try { - pollService.checkPoll(pollUri); + securityService.checkPoll(pollUri); isAccessAllowed = true; if (log.isDebugEnabled()) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/ResultAccessRequired.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -26,10 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.exceptions.UnauthorizedPollAccessException; -import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.services.impl.SecurityService; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; @@ -72,14 +70,10 @@ PollUri pollUri = getPollUri(request); - PollenServiceContext serviceContext = - getServiceContext(request); + SecurityService securityService = getSecurityService(request); - PollService pollService = - serviceContext.newService(PollService.class); - try { - pollService.checkPollResult(pollUri); + securityService.checkPollResult(pollUri); isAccessAllowed = true; if (log.isDebugEnabled()) { Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-io.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-io.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-io.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -34,7 +31,6 @@ <result-types> - <result-type name="redirectToVote" class="org.chorem.pollen.ui.results.PollenServletActionRedirectResult"> <param name="namespace">/poll</param> @@ -73,15 +69,15 @@ <result name="input">/WEB-INF/jsp/poll/create.jsp</result> <result type="pollenRedirectAction"> <param name="namespace">/poll</param> - <param name="actionName">resume/${uriId}</param> + <param name="actionName">summary/${uriId}</param> </result> </action> <!-- resume poll --> - <action name="resume/*" method="execute" - class="org.chorem.pollen.ui.actions.poll.ResumePoll"> + <action name="summary/*" method="execute" + class="org.chorem.pollen.ui.actions.poll.SummaryPoll"> <param name="uriId">{1}</param> - <result>/WEB-INF/jsp/poll/resume.jsp</result> + <result>/WEB-INF/jsp/poll/summary.jsp</result> </action> <!-- export poll --> Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -20,6 +20,7 @@ pollen.action.delete=Delete pollen.action.deleteChoice=Delete the choice pollen.action.deleteFavoriteList=Delete a list +pollen.action.deletePoll=Delete the poll pollen.action.deletePollAccount=Delete selected member pollen.action.deleteUser=Delete selected user pollen.action.deleteVote=Supprimer ce vote @@ -44,6 +45,7 @@ pollen.action.pollModerateVote=Administrate votes pollen.action.pollPersonToListDelete=Delete this voter pollen.action.pollResult=Display poll results +pollen.action.pollSummary=Poll summary pollen.action.pollVote=Vote pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants @@ -255,10 +257,14 @@ pollen.information.vote.deleted=Vote deleted. pollen.information.your.are.loggued=You are logged. pollen.label.contact.administrator=Send an email to an administrator +pollen.label.pollClonePage=<strong>Clone your poll</strong> +pollen.label.pollClosePage=<strong>Close your poll</strong> +pollen.label.pollDeletePage=<strong>Delete your poll</strong> pollen.label.pollEditPage=<strong>To modify your poll</strong>. Save it to be able to modify your poll later if you need it or to close it\: +pollen.label.pollExportPage=<strong>Export your poll</strong> pollen.label.pollModerateVotePage=<strong>To moderate your poll (you can't vote from this url)</strong>. Save it to be able to delete votes and comments\: pollen.label.pollRegisterPage=If you are a logged user, you can find these links on the page -pollen.label.pollResultPage=The link below leads to the page to count the votes. Save it to be able to count the vote later\: +pollen.label.pollResultPage=<strong>To count the vote</strong>.Save it to be able to count the vote later\: pollen.label.pollVotePage=<strong>To vote on your poll</strong>. Save it and send it to the people that you want to vote\: pollen.legend.attachPoll=Attach an anonymous poll to your user account pollen.legend.login=Login Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -20,6 +20,7 @@ pollen.action.delete=Supprimer pollen.action.deleteChoice=Supprimer le choix pollen.action.deleteFavoriteList=Supprimer une liste sélectionnée +pollen.action.deletePoll=Supprimer le sondage pollen.action.deletePollAccount=Supprimer une membre de la liste pollen.action.deleteUser=Supprimer un utilisateur sélectionné pollen.action.deleteVote=Supprimer ce vote @@ -44,6 +45,7 @@ pollen.action.pollModerateVote=Administrer les votes pollen.action.pollPersonToListDelete=Supprimer ce votant pollen.action.pollResult=Afficher les résultats du sondage +pollen.action.pollSummary=Réumsé du sondage pollen.action.pollVote=Voter pollen.action.pollVotingListDelete=Supprimer le groupe de votants pollen.action.pollVotingListEdit=Editer ce groupe de votants @@ -255,10 +257,14 @@ pollen.information.vote.deleted=Vote supprimé. pollen.information.your.are.loggued=Vous êtes connecté. pollen.label.contact.administrator=Contacter un administrateur +pollen.label.pollClonePage=<strong>Cloner le sondage</strong> +pollen.label.pollClosePage=<strong>Fermer le sondage</strong> +pollen.label.pollDeletePage=<strong>Supprimer le sondage</strong> pollen.label.pollEditPage=<strong>Lien pour configurer le sondage</strong>. Enregistrez-le pour pouvoir modifier votre sondage au besoin ou le clore \: +pollen.label.pollExportPage=<strong>Exporter le sondage</strong> pollen.label.pollModerateVotePage=<strong>Lien pour modérer le sondage (ce lien ne permet pas de voter)</strong>. Enregistrez-le pour pouvoir supprimer des votes et commentaires \: pollen.label.pollRegisterPage=Si vous êtes un utilisateur identifié, vous pouvez retrouver ces liens dans la page -pollen.label.pollResultPage=Le lien ci-dessous mène à la page de dépouillement. Enregistrez-le pour pouvoir accéder au dépouillement plus tard \: +pollen.label.pollResultPage=<strong>Lien pour dépouiller le sondage</strong>. Enregistrez-le pour pouvoir accéder au dépouillement plus tard \: pollen.label.pollVotePage=<strong>Lien pour voter</strong>. Enregistrez-le et envoyez-le à ceux que vous voulez voir voter \: pollen.legend.attachPoll=Attacher un sondage anonyme à votre compte pollen.legend.login=Login Modified: trunk/pollen-ui-struts2/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/log4j.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/log4j.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoice-conversion.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% @@ -21,4 +20,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter \ No newline at end of file +voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/business/persistence/VoteToChoiceImpl-conversion.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% @@ -21,4 +20,4 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter \ No newline at end of file +voteValue=org.chorem.pollen.ui.converters.BooleanIntegerConverter Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -49,4 +48,4 @@ </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -49,4 +48,4 @@ </field> -</validators> \ No newline at end of file +</validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/pollen.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/pollen.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <#-- #%L - EchoBase :: UI - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <#-- #%L - EchoBase :: UI - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -575,4 +574,4 @@ left: -4px; /*must have*/ width: 200px; /*must have*/ height: 200px; /*must have*/ -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -575,4 +574,4 @@ left: -4px; /*must have*/ width: 200px; /*must have*/ height: 200px; /*must have*/ -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/resources/validators.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/validators.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/validators.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/resources/xwork-conversion.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L -# Pollen :: UI (strust2) -# +# Pollen :: UI (struts2) # $Id$ # $HeadURL$ # %% @@ -11,15 +10,15 @@ # it under the terms of the GNU Affero General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### org.chorem.pollen.bean.PollUri=org.chorem.pollen.ui.converters.PollUriConverter -java.util.Date=org.chorem.pollen.ui.converters.DateConverter \ No newline at end of file +java.util.Date=org.chorem.pollen.ui.converters.DateConverter Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,7 @@ <%@ page import="org.chorem.pollen.ui.actions.PollenActionSupport" %> <%-- #%L - Pollen :: UI (strust2) + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -53,4 +50,4 @@ <s:submit key="pollen.action.delete" theme="simple" action="deleteUser"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -52,5 +51,5 @@ <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' - formatter="pollFunctions" width="180" sortable="false"/> + formatter="pollFunctions" width="55" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -37,4 +36,4 @@ </s:a> <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClonePoll.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -56,4 +53,4 @@ action="clone/%{pollId}"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmClosePoll.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -53,4 +50,4 @@ action="close/%{pollId}"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePoll.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -53,4 +50,4 @@ action="delete/%{pollId}"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -43,4 +42,4 @@ key="pollen.action.cancel"/> <s:submit key="pollen.action.delete" theme="simple"/> </div> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollComment.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -48,4 +47,4 @@ key="pollen.action.cancel"/> <s:submit key="pollen.action.delete" theme="simple"/> </div> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/confirmDeletePollVote.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -45,4 +44,4 @@ key="pollen.action.cancel"/> <s:submit key="pollen.action.delete" theme="simple"/> </div> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll_choices.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -240,4 +239,4 @@ <hr/> <s:submit key="pollen.action.addChoice" align="center" onclick="return addNewChoice();" disabled="%{voteStarted}"/> -</fieldset> \ No newline at end of file +</fieldset> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayDateChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -68,4 +67,4 @@ </s:a> </div> <div class="cleanBoth"></div> -</div> \ No newline at end of file +</div> 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-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayImageChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -97,4 +96,4 @@ </div> <div class="cleanBoth"></div> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPersonToList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -66,4 +65,4 @@ </s:if> <div class="cleanBoth"></div> -</s:div> \ No newline at end of file +</s:div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComment.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -44,4 +43,4 @@ <p> <s:property value='#comment.text'/> </p> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayPollComments.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -102,4 +101,4 @@ </tbody> </table> </div> -</div--%> \ No newline at end of file +</div--%> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayTextChoice.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -64,4 +63,4 @@ </s:a> </div> <div class="cleanBoth"></div> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/personListToVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -192,4 +191,4 @@ <%--</div>--%> <%--</t:remove>--%> -</s:if> \ No newline at end of file +</s:if> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resultLink.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -31,6 +30,7 @@ <div style="margin-top: 10px;"> <img src="<s:url value='/img/count.png'/>" alt="<s:text name='pollen.common.resultAction'/>" + title="<s:text name='pollen.common.resultAction'/>" style="margin-right: 18px;"/> <s:text name='pollen.label.pollResultPage'/> <br/> @@ -43,4 +43,4 @@ <s:a namespace="/user" action="createdList"> <s:text name="pollen.common.myPolls"/> </s:a>. -</div> \ No newline at end of file +</div> Deleted: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,76 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<link rel="stylesheet" type="text/css" href="<s:url value='/css/resume.css'/>"/> - -<h1 class="titleCreation"><s:property value="poll.title"/></h1> - -<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> - <s:property value="poll.creator.votingId"/></h3> - -<div class="ui-widget-content ui-corner-all"> - - <s:label key="pollen.common.pollId" value="%{poll.pollId}"/> - <br/> -</div> - -<s:if test="freePoll"> - <div class="ui-widget-content-green ui-corner-all"> - <img src="<s:url value='/img/vote.png'/>" - alt="<s:text name='pollen.common.voteAction'/>" - style="margin-right: 18px;"/> - <s:text name="pollen.label.pollVotePage"/> - <br/> - <s:a href="%{pollVoteUrl}" cssStyle="margin-left:50px;"> - <s:property value="%{pollVoteUrl}"/> - </s:a> - </div> -</s:if> -<div class="ui-widget-content-yellow ui-corner-all"> - <img src="<s:url value='/img/moderate.png'/>" - alt="<s:text name='pollen.action.pollModerateVote'/>" - style="margin-right: 20px;"/> - <s:text name='pollen.label.pollModerateVotePage'/> - <br/> - <s:a href="%{pollModerateUrl}" cssStyle="margin-left:50px;"> - <s:property value="%{pollModerateUrl}"/> - </s:a> -</div> -<div class="ui-widget-content ui-corner-all"> - <img src="<s:url value='/img/edit.png'/>" - alt="<s:text name='pollen.common.editAction'/>" - style="margin-right: 20px;"/> - <s:text name='pollen.label.pollEditPage'/> - <br/> - <s:a href="%{pollEditUrl}" cssStyle="margin-left:50px;"> - <s:property value="%{pollEditUrl}"/> - </s:a> -</div> -<div style="margin-top: 30px;"> - <s:text name="pollen.label.pollRegisterPage"/> - <s:a namespace="/user" action="createdList"> - <s:text name="pollen.common.myPolls"/> - </s:a>. -</div> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToAddToVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/selectPersonListToCreateNewVotingList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -51,4 +50,4 @@ onclick="return importPersonListToNewVotingList($('#personList').val(), cancel);" key="pollen.action.importPersonListToNewVotingList"/> </div> -</fieldset> \ No newline at end of file +</fieldset> Copied: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp (from rev 3421, trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/resume.jsp) =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,167 @@ +<%-- + #%L + Pollen :: UI (struts2) + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<link rel="stylesheet" type="text/css" href="<s:url value='/css/summary.css'/>"/> + +<script type="text/javascript"> + var redirectUrl = '<s:url namespace="/poll" action="summary/%{uriId}"/>'; + + function confirmDeletePoll(id) { + $('.ui-dialog-title').html("<s:text name="pollen.title.delete.poll"/>"); + var dialog = $("#confirmDialog"); + dialog.html(''); + var url = "<s:url action='confirmDeletePoll/' namespace='/poll'/>"; + url += id + '?' + $.param({redirectUrl:redirectUrl}); + dialog.load(url); + dialog.dialog('open'); + return false; + } + + function confirmClosePoll(id) { + $('.ui-dialog-title').html("<s:text name="pollen.title.close.poll"/>"); + var dialog = $("#confirmDialog"); + dialog.html(''); + var url = "<s:url action='confirmClosePoll/' namespace='/poll'/>"; + url += id + '?' + $.param({redirectUrl:redirectUrl}); + dialog.load(url); + dialog.dialog('open'); + return false; + } +</script> + +<h1 class="titleCreation"><s:property value="poll.title"/></h1> + +<h3><s:property value="poll.title"/> <s:text name="pollen.common.by"/> + <s:property value="poll.creator.votingId"/></h3> + +<div class="ui-widget-content ui-corner-all"> + + <s:label key="pollen.common.pollId" value="%{poll.pollId}"/> + <br/> +</div> + +<%--Vote action--%> +<s:if test="canVote"> + <div class="ui-widget-content-green ui-corner-all"> + <img src="<s:url value='/img/vote.png'/>" class="imgAction" + alt="<s:text name='pollen.common.voteAction'/>" + title="<s:text name='pollen.common.voteAction'/>"/> + <s:text name="pollen.label.pollVotePage"/> + <br/> + <s:a href="%{voteUrl}"> + <s:property value="%{voteUrl}"/> + </s:a> + </div> +</s:if> + +<%--Show Results action--%> +<s:if test="canShowResult"> + <div class="ui-widget-content-green ui-corner-all"> + <img src="<s:url value='/img/count.png'/>" class="imgAction" + alt="<s:text name='pollen.action.pollResult'/>" + title="<s:text name='pollen.action.pollResult'/>"/> + <s:text name='pollen.label.pollResultPage'/> + <br/> + <s:a href="%{resultUrl}"> + <s:property value="%{resultUrl}"/> + </s:a> + </div> +</s:if> + +<%--Moderate action--%> +<div class="ui-widget-content-yellow ui-corner-all"> + <img src="<s:url value='/img/moderate.png'/>" class="imgAction" + alt="<s:text name='pollen.action.pollModerateVote'/>" + title="<s:text name='pollen.action.pollModerateVote'/>"/> + <s:text name='pollen.label.pollModerateVotePage'/> + <br/> + <s:a href="%{moderateUrl}"> + <s:property value="%{moderateUrl}"/> + </s:a> +</div> + +<%--Edit action--%> +<div class="ui-widget-content-yellow ui-corner-all"> + <img src="<s:url value='/img/edit.png'/>" class="imgAction" + alt="<s:text name='pollen.action.editPoll'/>" + title="<s:text name='pollen.action.editPoll'/>"/> + <s:text name='pollen.label.pollEditPage'/> + <br/> + <s:a href="%{editUrl}"> + <s:property value="%{editUrl}"/> + </s:a> +</div> + +<%--Export action--%> +<div class="ui-widget-content-blue ui-corner-all"> + <img src="<s:url value='/img/export.png'/>" class="imgAction" + alt="<s:text name='pollen.action.pollExport'/>" + title="<s:text name='pollen.action.pollExport'/>"/> + <s:a href="%{exportUrl}"> + <s:text name='pollen.label.pollExportPage'/> + </s:a> +</div> + +<%--Clone action--%> +<div class="ui-widget-content-blue ui-corner-all"> + <img src="<s:url value='/img/copy.png'/>" class="imgAction" + alt="<s:text name='pollen.action.clone'/>" + title="<s:text name='pollen.action.clone'/>"/> + <s:a href="%{cloneUrl}"> + <s:text name='pollen.label.pollClonePage'/> + </s:a> +</div> + +<%--Close action--%> +<s:if test="canClose"> + <div class="ui-widget-content-red ui-corner-all"> + <img src="<s:url value='/img/close.png'/>" class="imgAction" + alt="<s:text name='pollen.action.close'/>" + title="<s:text name='pollen.action.close'/>"/> + <s:a href="#" onclick="return confirmClosePoll('%{uriId}')"> + <s:text name='pollen.label.pollClosePage'/> + </s:a> + + </div> +</s:if> + +<%--Delete action--%> +<div class="ui-widget-content-red ui-corner-all"> + <img src="<s:url value='/img/delete.png'/>" class="imgAction" + alt="<s:text name='pollen.action.deletePoll'/>" + title="<s:text name='pollen.action.deletePoll'/>"/> + <s:a href="#" onclick="return confirmDeletePoll('%{uriId}')"> + <s:text name='pollen.label.pollDeletePage'/> + </s:a> +</div> + +<div style="margin-top: 30px;"> + <s:text name="pollen.label.pollRegisterPage"/> + <s:a namespace="/user" action="createdList"> + <s:text name="pollen.common.myPolls"/> + </s:a>. +</div> + +<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/summary.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -491,4 +490,4 @@ <sj:dialog id="confirmDialog" resizable="false" autoOpen="false" modal="true" width="800"/> </div> -</s:if> \ No newline at end of file +</s:if> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -34,28 +33,34 @@ <s:url id='voteImg' value='/img/vote.png'/> <s:set id='voteTitle'><s:text name="pollen.action.pollVote"/></s:set> -<s:url id='moderateImg' value='/img/moderate.png'/> -<s:set id='moderateTitle'><s:text name="pollen.action.pollModerateVote"/></s:set> +<s:url id='blankImg' value='/img/blank.png'/> +<s:url id="summaryUrl" action="summary/" namespace="/poll"/> +<s:url id='summaryImg' value='/img/edit.png'/> +<s:set id='summaryTitle'><s:text name="pollen.action.pollSummary"/></s:set> + +<%--<s:url id='moderateImg' value='/img/moderate.png'/>--%> +<%--<s:set id='moderateTitle'><s:text name="pollen.action.pollModerateVote"/></s:set>--%> + <s:url id="resultUrl" action="results/" namespace="/poll"/> <s:url id='resultImg' value='/img/count.png'/> <s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> -<s:url id="editUrl" action="modification/" namespace="/poll"/> -<s:url id='editImg' value='/img/edit.png'/> -<s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set> +<%--<s:url id="editUrl" action="modification/" namespace="/poll"/>--%> +<%--<s:url id='editImg' value='/img/edit.png'/>--%> +<%--<s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set>--%> -<s:url id="closeUrl" action="confirmClosePoll/" namespace="/poll"/> -<s:url id='closeImg' value='/img/close.png'/> -<s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set> +<%--<s:url id="closeUrl" action="confirmClosePoll/" namespace="/poll"/>--%> +<%--<s:url id='closeImg' value='/img/close.png'/>--%> +<%--<s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set>--%> -<s:url id="exportUrl" action="export/" namespace="/poll"/> -<s:url id='exportImg' value='/img/export.png'/> -<s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set> +<%--<s:url id="exportUrl" action="export/" namespace="/poll"/>--%> +<%--<s:url id='exportImg' value='/img/export.png'/>--%> +<%--<s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set>--%> -<s:url id="cloneUrl" action="clone/" namespace="/poll"/> -<s:url id='cloneImg' value='/img/copy.png'/> -<s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set> +<%--<s:url id="cloneUrl" action="clone/" namespace="/poll"/>--%> +<%--<s:url id='cloneImg' value='/img/copy.png'/>--%> +<%--<s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set>--%> <s:url id="deleteUrl" action="confirmDeletePoll/" namespace="/poll"/> <s:url id='deleteImg' value='/img/delete.png'/> @@ -96,6 +101,12 @@ if (cellvalue.indexOf('vote') > -1) { result += formatLink("${voteUrl}" + voteId, "${voteImg}", "Vote", "${voteTitle}") } + if (cellvalue.indexOf('novote') > -1) { + result +="<image src='${blankImg}'>"; + } + if (cellvalue.indexOf('summary') > -1) { + result += formatLink("${summaryUrl}" + adminId, "${summaryImg}", "Moderate", "${summaryTitle}") + } if (cellvalue.indexOf('moderate') > -1) { result += formatLink("${voteUrl}" + moderateId, "${moderateImg}", "Moderate", "${moderateTitle}") } Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/admin_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Vous devez être connecter en administrateur pour accéder à cette page.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/connected_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Vous devez être connecter pour accéder à cette page.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_access_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Vous n'êtes pas autorisé à accéder à cette page de sondage.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_creator_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Seul le créateur du sondage ou un administratuer peut accéder à cette page.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/poll_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Aucun sondage à l'url donné.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/security/result_access_required.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -26,4 +25,4 @@ <ul class="actionErrors"> <li><span>Vous n'êtes pas autorisé à accéder à cette page de résultas.</span></li> </ul> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeleteFavoriteList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -53,4 +50,4 @@ action="deleteFavoriteList"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/confirmDeletePollAccount.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -54,4 +51,4 @@ action="deletePollAccount"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/createdList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -74,7 +73,7 @@ title='%{getText("pollen.common.beginDate")}'/> <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' - formatter="pollFunctions" width="200" sortable="false"/> + formatter="pollFunctions" width="65" sortable="false"/> </sjg:grid> <br/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -11,12 +10,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% @@ -46,4 +43,4 @@ action="lostPassword"/> </div> </fieldset> -</s:form> \ No newline at end of file +</s:form> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -138,4 +137,4 @@ key="pollen.action.backToFavoriteLists" align="center"/> </s:form> -<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> \ No newline at end of file +<sj:dialog id="confirmDialog" autoOpen="false" modal="true" width="500"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -52,7 +51,7 @@ var editTitle = '<s:text name="pollen.action.editFavoriteList"/>'; var deleteImg = '<s:url value='/img/delete.png'/>'; var csvHelp = "<div><s:text name='pollen.common.favoriteList.csvImport.help'/>" + - "<br/><img src=\"<s:url value="/img/import_csv_help.png"/>\"/></div>" + "<br/><img src=\"<s:url value="/img/import_csv_help.png"/>\"/></div>"; jQuery(document).ready(function () { Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/invitedList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -55,5 +54,5 @@ <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' - formatter="pollFunctions" width="180" sortable="false"/> + formatter="pollFunctions" width="55" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -66,4 +65,4 @@ <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> </s:a> -</div> \ No newline at end of file +</div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/participatedList.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -55,5 +54,5 @@ <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' - formatter="pollFunctions" width="180" sortable="false"/> + formatter="pollFunctions" width="55" sortable="false"/> </sjg:grid> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -197,4 +196,4 @@ #tooltip .tipFooter { height:8px; background:url(images/tipFooter.gif) no-repeat; - } \ No newline at end of file + } Modified: trunk/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/main.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -586,4 +585,4 @@ margin-bottom: 20px; padding: 10px 50px 10px 50px; border-top: 1px solid #aab; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/pollCreation.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -150,4 +149,4 @@ #toptions .wwlbl { width: 260px; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/css/results.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/results.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Deleted: trunk/pollen-ui-struts2/src/main/webapp/css/resume.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/resume.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/resume.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,33 +0,0 @@ -/* - * #%L - * Pollen :: UI (struts2) - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -.ui-widget-content-green { border: 1px solid #aaaaaa; background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content-green a { color: #222222; } - -.ui-widget-content-yellow { border: 1px solid #aaaaaa; background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } -.ui-widget-content-yellow a { color: #222222; } - -.ui-corner-all { - margin-top: 10px; - padding: 10px; -} - Copied: trunk/pollen-ui-struts2/src/main/webapp/css/summary.css (from rev 3421, trunk/pollen-ui-struts2/src/main/webapp/css/resume.css) =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/summary.css (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/css/summary.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -0,0 +1,46 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +.ui-widget-content-green { border: 1px solid #aaaaaa; background: #b0f580 url(images/ui-bg_flat_75_b0f580_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-green a { color: #222222; } + +.ui-widget-content-yellow { border: 1px solid #aaaaaa; background: #ffffaa url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-yellow a { color: #222222; } + +.ui-widget-content-red { border: 1px solid #aaaaaa; background: #FFAAAA url(images/ui-bg_flat_75_ffffaa_40x100.png) 50% 50% repeat-x; color: #222222; } +.ui-widget-content-red a { color: #222222; } + +.ui-widget-content-blue { border: 1px solid #dddddd; background: #A9D4E3 url(images/ui-bg_highlight-hard_100_f2f5f7_1x100.png) 50% top repeat-x; color: #362b36; } +.ui-widget-content-blue a { color: #362b36; } + +.ui-corner-all { + margin-top: 10px; + padding: 10px; +} + +.showResultIcon { + background: #FFE3E3 url(../img/count.png) 80% 80% repeat-x; +} +.imgAction { + margin-right: 20px; +} + Property changes on: trunk/pollen-ui-struts2/src/main/webapp/css/summary.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/css/vote.css 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -216,4 +215,4 @@ #commentsDiv div { padding: 5px 15px; -} \ No newline at end of file +} Copied: trunk/pollen-ui-struts2/src/main/webapp/img/blank.png (from rev 3421, trunk/pollen-ui-struts2/src/main/webapp/img/vote.png) =================================================================== (Binary files differ) Modified: trunk/pollen-ui-struts2/src/main/webapp/index.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/index.jsp 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/index.jsp 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ <%-- #%L - Pollen :: UI (strust2) - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -651,4 +650,4 @@ changePollType(datas['pollType']); $('.tooltip').tipTip({ defaultPosition:'top' }); -}); \ No newline at end of file +}); Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteList.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -101,4 +100,4 @@ dialog.load(url); dialog.dialog('open'); return false; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% @@ -96,4 +95,4 @@ dialog.load(url); dialog.dialog('open'); return false; -} \ No newline at end of file +} Modified: trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/main/webapp/js/usersList.js 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L - * Pollen :: UI (strust2) - * + * Pollen :: UI (struts2) * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-ui-struts2/src/site/fr/rst/index.rst =================================================================== --- trunk/pollen-ui-struts2/src/site/fr/rst/index.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/site/fr/rst/index.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen :: UI (struts2) -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/pollen-ui-struts2/src/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-ui-struts2/src/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-ui-struts2/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: UI (struts2) $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -52,4 +51,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -52,4 +51,4 @@ } return result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -160,4 +159,4 @@ public String toString() { return "Choice id=" + idChoice + " _ value=" + value; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -332,4 +331,4 @@ List<PercentageBehavior> list = new ArrayList<PercentageBehavior>(choices); choiceDTO.setPercentage(Utils.calculatePercentage(choice, list)); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -228,4 +227,4 @@ return resChoices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -125,4 +124,4 @@ public List<Vote> list() { return getVotes(); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -54,4 +53,4 @@ */ public void executeStats(List<Choice> choices, boolean groupCounting, Choice choice, ChoiceDTO choiceDTO); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -46,4 +45,4 @@ } return 0; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -126,4 +125,4 @@ List<PercentageBehavior> list = new ArrayList<PercentageBehavior>(choices); choiceDTO.setPercentage(Utils.calculatePercentage(choice, list)); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -79,4 +78,4 @@ public String getVotingID() { return this.votingID; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Gestion des dépouillements. */ -package org.chorem.pollen.votecounting.business; \ No newline at end of file +package org.chorem.pollen.votecounting.business; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -121,4 +120,4 @@ public void setResult(boolean result) { this.result = result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -54,4 +53,4 @@ public void setText(String text) { this.text = text; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -82,4 +81,4 @@ public void setHidden(boolean hidden) { this.hidden = hidden; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -255,4 +254,4 @@ public void setComments(List<CommentDTO> comments) { this.comments = comments; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -98,4 +97,4 @@ this.choices = choices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -60,4 +59,4 @@ this.idChoice = idChoice; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -86,4 +85,4 @@ this.votingPersons = votingPersons; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -114,4 +113,4 @@ this.choices = choices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Data Transfert Objects. */ -package org.chorem.pollen.votecounting.dto; \ No newline at end of file +package org.chorem.pollen.votecounting.dto; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -564,4 +563,4 @@ return vectorChoices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -36,4 +35,4 @@ public VoteCountingResultDTO executeVoteCounting(PollDTO poll); public VoteCountingResultDTO executeGroupCounting(PollDTO poll); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -232,4 +231,4 @@ group.addVote(vote.getValue(), weight, votingID); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Services proposés par le module VoteCounting. */ -package org.chorem.pollen.votecounting.services; \ No newline at end of file +package org.chorem.pollen.votecounting.services; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -32,4 +31,4 @@ */ public interface ListBehavior<T> { public List<T> list(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -30,4 +29,4 @@ */ public interface PercentageBehavior { public double value(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -67,4 +66,4 @@ return nbVotes; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -24,4 +23,4 @@ /** * Classes utilitaires. */ -package org.chorem.pollen.votecounting.utils; \ No newline at end of file +package org.chorem.pollen.votecounting.utils; Modified: trunk/pollen-votecounting/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting/src/main/resources/log4j.properties 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/main/resources/log4j.properties 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ ### # #%L # Pollen :: Vote Counting -# # $Id$ # $HeadURL$ # %% Modified: trunk/pollen-votecounting/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: Vote Counting $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-votecounting/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,8 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - Pollen - + Pollen :: Vote Counting $Id$ $HeadURL$ %% @@ -12,12 +11,10 @@ it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. #L% Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -45,4 +44,4 @@ * @return le sondage */ public PollDTO createTestPoll(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -247,4 +246,4 @@ return groups; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ /* * #%L * Pollen :: Vote Counting - * * $Id$ * $HeadURL$ * %% @@ -150,4 +149,4 @@ VoteCountingResultDTO result = instance.executeGroupCounting(poll); //assertEquals(expResult, result); } -} \ No newline at end of file +} Modified: trunk/src/site/fr/rst/configure.rst =================================================================== --- trunk/src/site/fr/rst/configure.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/fr/rst/configure.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% @@ -11,12 +10,12 @@ .. * it under the terms of the GNU Affero General Public License as published by .. * the Free Software Foundation, either version 3 of the License, or .. * (at your option) any later version. -.. * +.. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. -.. * +.. * .. * You should have received a copy of the GNU Affero General Public License .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% @@ -101,4 +100,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _page des options: ./pollen-ui-struts2/application-config-report.html \ No newline at end of file +.. _page des options: ./pollen-ui-struts2/application-config-report.html Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/fr/rst/depouillement.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/fr/rst/index.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/configure.rst =================================================================== --- trunk/src/site/rst/configure.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/rst/configure.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% @@ -11,12 +10,12 @@ .. * it under the terms of the GNU Affero General Public License as published by .. * the Free Software Foundation, either version 3 of the License, or .. * (at your option) any later version. -.. * +.. * .. * This program is distributed in the hope that it will be useful, .. * but WITHOUT ANY WARRANTY; without even the implied warranty of .. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the .. * GNU General Public License for more details. -.. * +.. * .. * You should have received a copy of the GNU Affero General Public License .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% @@ -96,4 +95,4 @@ | MySql | org.hibernate.dialect.MySQLDialect | com.mysql.jdbc.Driver | jdbc:mysql:pollen | +-------------------------+------------------------------------------+-----------------------------------+------------------------------------------+ -.. _options page: ./application-config-report.html \ No newline at end of file +.. _options page: ./application-config-report.html Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/rst/index.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/rst/methods.rst 2012-06-05 16:50:22 UTC (rev 3423) @@ -1,7 +1,6 @@ .. - .. * #%L .. * Pollen -.. * .. * $Id$ .. * $HeadURL$ .. * %% Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/site_en.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -2,7 +2,6 @@ <!-- #%L Pollen - $Id$ $HeadURL$ %% Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-06-05 07:40:14 UTC (rev 3422) +++ trunk/src/site/site_fr.xml 2012-06-05 16:50:22 UTC (rev 3423) @@ -2,7 +2,6 @@ <!-- #%L Pollen - $Id$ $HeadURL$ %%