branch pollen-udpate-1.6 updated (77fa61f -> c3e47af)
This is an automated email from the git hooks/post-receive script. New change to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 77fa61f Update to log4j2 new e75e861 Remove profil (too complicated) new c3e47af Fix java8 javadoc, deps... The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c3e47afdd1c8a2c83197800a13af7ca46e4d3f2b Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Nov 16 15:05:01 2015 +0100 Fix java8 javadoc, deps... commit e75e861aae92cf1997e9f553327eb1f32e76ac19 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Nov 16 15:04:26 2015 +0100 Remove profil (too complicated) Summary of changes: .../pollen/PollenApplicationConfigProvider.java | 2 +- .../org/chorem/pollen/PollenConfiguration.java | 2 +- .../chorem/pollen/PollenConfigurationOption.java | 2 +- .../java/org/chorem/pollen/PollenFunctions.java | 2 +- .../main/java/org/chorem/pollen/PollenIOUtil.java | 2 +- .../chorem/pollen/PollenTechnicalException.java | 2 +- .../pollen/PollenTopiaRootContextFactory.java | 2 +- .../pollen/business/persistence/I18nAble.java | 2 +- .../business/persistence/PersonToListDAOImpl.java | 4 +-- .../business/persistence/PollAccountDAOImpl.java | 4 +-- .../pollen/business/persistence/PollActions.java | 2 +- .../persistence/PollCommentVisibility.java | 2 +- .../business/persistence/PollVoteVisibility.java | 4 +-- .../chorem/pollen/business/persistence/Polls.java | 8 +++--- .../business/persistence/VotingListImpl.java | 2 +- .../business/persistence/AbstractDAOTest.java | 4 +-- .../business/persistence/CommentDAOImplTest.java | 2 +- .../persistence/PersonListDAOImplTest.java | 2 +- .../persistence/PersonToListDAOImplTest.java | 2 +- .../persistence/PollAccountDAOImplTest.java | 2 +- .../business/persistence/PollDAOImplTest.java | 2 +- .../pollen/business/persistence/PollTest.java | 2 +- .../persistence/UserAccountDAOImplTest.java | 2 +- .../business/persistence/VoteDAOImplTest.java | 2 +- pollen-persistence/src/test/resources/log4j2.xml | 21 ++++++++++++++ pollen-services/src/license/THIRD-PARTY.properties | 19 ++++++++----- .../chorem/pollen/PollenApplicationContext.java | 2 +- .../chorem/pollen/PollenUserSecurityContext.java | 14 ++++----- .../org/chorem/pollen}/TopiaTransactionFilter.java | 33 +++++++++++----------- .../org/chorem/pollen/bean/PollDateChoice.java | 2 +- .../org/chorem/pollen/bean/PollImageChoice.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUri.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUrl.java | 2 +- .../migration/PollenMigrationCallback.java | 2 +- .../migration/PollenMigrationCallbackV1_1.java | 2 +- .../migration/PollenMigrationCallbackV1_2.java | 2 +- .../migration/PollenMigrationCallbackV1_3.java | 2 +- .../migration/PollenMigrationCallbackV1_3_1.java | 2 +- .../migration/PollenMigrationCallbackV1_4.java | 2 +- .../migration/PollenMigrationCallbackV1_4_5.java | 2 +- .../migration/PollenMigrationCallbackV1_5.java | 2 +- .../services/DefaultPollenServiceContext.java | 2 +- .../pollen/services/PollenNotifierWorker.java | 2 +- .../org/chorem/pollen/services/PollenService.java | 2 +- .../pollen/services/PollenServiceContext.java | 2 +- .../pollen/services/PollenServiceFactory.java | 2 +- .../pollen/services/PollenServiceFunctions.java | 2 +- .../pollen/services/PollenServiceSupport.java | 2 +- .../FavoriteListAlreadyExistException.java | 2 +- .../exceptions/FavoriteListImportException.java | 2 +- .../exceptions/FavoriteListNotFoundException.java | 2 +- .../FavoriteListNotOwnedByUserException.java | 2 +- .../services/exceptions/InvalidEmailException.java | 2 +- .../ParticipantAlreadyFoundInListException.java | 2 +- .../ParticipantExistWithoutMailException.java | 2 +- .../exceptions/ParticipantNotFoundException.java | 2 +- .../ParticipantNotFoundInListException.java | 2 +- .../services/exceptions/PollAccountNotFound.java | 2 +- .../exceptions/PollAlreadyClosedException.java | 2 +- .../exceptions/PollAlreadyExistException.java | 2 +- .../exceptions/PollChoiceNotFoundException.java | 2 +- .../services/exceptions/PollCommentNotFound.java | 2 +- .../services/exceptions/PollNotFoundException.java | 2 +- .../exceptions/PollVoteNotFoundException.java | 2 +- .../UnauthorizedPollAccessException.java | 2 +- .../exceptions/UserEmailAlreadyUsedException.java | 2 +- .../exceptions/UserInvalidPasswordException.java | 2 +- .../exceptions/UserLoginAlreadyUsedException.java | 2 +- .../services/exceptions/UserNotFoundException.java | 2 +- .../services/exceptions/VoteDoubloonException.java | 2 +- .../exceptions/VoteNotAllowedException.java | 2 +- .../services/exceptions/VoteNotFoundException.java | 2 +- .../pollen/services/impl/PollCommentService.java | 2 +- .../pollen/services/impl/PollExportService.java | 2 +- .../pollen/services/impl/PollFeedService.java | 2 +- .../pollen/services/impl/PollUrlService.java | 2 +- .../services/impl/PollVoteCountingService.java | 4 +-- .../pollen/services/impl/PreventRuleService.java | 2 +- .../pollen/services/impl/SecurityService.java | 2 +- .../pollen/services/AbstractPollenServiceTest.java | 2 +- .../pollen/services/impl/EmailServiceTest.java | 2 +- .../pollen/services/impl/FavoriteServiceTest.java | 2 +- .../pollen/services/impl/PollServiceTest.java | 2 +- .../pollen/services/impl/UserServiceTest.java | 2 +- .../pollen/services/impl/VoteServiceTest.java | 2 +- pollen-services/src/test/resources/log4j2.xml | 21 ++++++++++++++ pollen-ui-struts2/pom.xml | 22 +-------------- .../chorem/pollen/ui/it/CreateFreeDatePollIT.java | 4 +-- .../chorem/pollen/ui/it/CreateFreeTextPollIT.java | 4 +-- .../pollen/ui/it/CreateRestrictedTextPollIT.java | 4 +-- .../pollen/ui/it/CreateTextPollForGroupIT.java | 4 +-- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/PollWithCommentIT.java | 2 +- .../chorem/pollen/ui/it/PollWithoutCommentIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../java/org/chorem/pollen/ui/it/AbstractIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../ui/it/freepoll/AnonymousPollByAdminIT.java | 4 +-- .../ui/it/freepoll/AnonymousPollByConnectedIT.java | 4 +-- .../it/freepoll/AnonymousPollByNotConnectedIT.java | 6 ++-- .../ui/it/freepoll/CreatorOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/CreatorOnlyByConnectedIT.java | 4 +-- .../it/freepoll/CreatorOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/EverybodyByAdminIT.java | 4 +-- .../ui/it/freepoll/EverybodyByConnectedIT.java | 4 +-- .../ui/it/freepoll/EverybodyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/FreePollTestSuite.java | 2 +- .../pollen/ui/it/freepoll/VoterOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByConnectedIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../chorem/pollen/ui/it/freepoll/java-info.java | 2 +- .../it/restrictedpoll/AnonymousPollByAdminIT.java | 4 +-- .../restrictedpoll/AnonymousPollByConnectedIT.java | 4 +-- .../AnonymousPollByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/CreatorOnlyByAdminIT.java | 4 +-- .../restrictedpoll/CreatorOnlyByConnectedIT.java | 4 +-- .../CreatorOnlyByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/EverybodyByAdminIT.java | 4 +-- .../it/restrictedpoll/EverybodyByConnectedIT.java | 4 +-- .../restrictedpoll/EverybodyByNotConnectedIT.java | 4 +-- .../it/restrictedpoll/RestrictedPollTestSuite.java | 2 +- .../ui/it/restrictedpoll/VoterOnlyByAdminIT.java | 4 +-- .../it/restrictedpoll/VoterOnlyByConnectedIT.java | 4 +-- .../restrictedpoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/restrictedpoll/java-info.java | 2 +- .../java/org/chorem/pollen/ui/it/LoginSIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/SecurityAccessSIT.java | 24 ++++++++-------- .../src/license/THIRD-PARTY.properties | 30 ++++++++++++-------- .../pollen/ui/PollenApplicationListener.java | 8 +++--- .../java/org/chorem/pollen/ui/PollenSession.java | 2 +- .../pollen/ui/PollenStaticContentLoader.java | 6 ++-- .../pollen/ui/PollenTopiaTransactionFilter.java | 3 +- .../java/org/chorem/pollen/ui/PollenUIUtils.java | 2 +- .../chorem/pollen/ui/actions/FileUploadAware.java | 8 +++--- .../org/chorem/pollen/ui/actions/PageSkin.java | 2 +- .../org/chorem/pollen/ui/actions/PollUriAware.java | 2 +- .../pollen/ui/actions/PollenActionSupport.java | 28 +++++++++--------- .../ui/actions/PollenActionSupportForEdition.java | 2 +- .../ui/actions/PollenActionSupportForVote.java | 2 +- .../pollen/ui/actions/PollenUserSecurityAware.java | 2 +- .../chorem/pollen/ui/actions/admin/Confirm.java | 2 +- .../chorem/pollen/ui/actions/admin/DeleteUser.java | 2 +- .../pollen/ui/actions/admin/ManagePolls.java | 2 +- .../pollen/ui/actions/admin/ManageUsers.java | 2 +- .../pollen/ui/actions/admin/package-info.java | 2 +- .../chorem/pollen/ui/actions/io/GenerateChart.java | 2 +- .../pollen/ui/actions/io/GetPollImageChoice.java | 2 +- .../chorem/pollen/ui/actions/io/package-info.java | 2 +- .../ui/actions/json/AbstractJSONPaginedAction.java | 2 +- .../ui/actions/json/AbstractJSONSimpleAction.java | 2 +- .../pollen/ui/actions/json/GetCreatedPolls.java | 2 +- .../pollen/ui/actions/json/GetFavoriteList.java | 2 +- .../actions/json/GetFavoriteListPollAccount.java | 2 +- .../actions/json/GetFavoriteListPollAccounts.java | 2 +- .../pollen/ui/actions/json/GetFavoriteLists.java | 2 +- .../pollen/ui/actions/json/GetInvitedPolls.java | 2 +- .../ui/actions/json/GetParticipatedPolls.java | 2 +- .../chorem/pollen/ui/actions/json/GetPolls.java | 2 +- .../org/chorem/pollen/ui/actions/json/GetUser.java | 2 +- .../chorem/pollen/ui/actions/json/GetUsers.java | 2 +- .../pollen/ui/actions/json/package-info.java | 2 +- .../org/chorem/pollen/ui/actions/package-info.java | 2 +- .../chorem/pollen/ui/actions/poll/GetPollFeed.java | 2 +- .../pollen/ui/actions/poll/ResultForPoll.java | 2 +- .../pollen/ui/actions/poll/admin/ClosePoll.java | 2 +- .../ui/actions/poll/admin/ConfirmPollAction.java | 2 +- .../pollen/ui/actions/poll/admin/DeletePoll.java | 2 +- .../pollen/ui/actions/poll/admin/ExportPoll.java | 2 +- .../pollen/ui/actions/poll/admin/SummaryPoll.java | 2 +- .../pollen/ui/actions/poll/admin/package-info.java | 2 +- .../actions/poll/form/AbstractDisplayChoice.java | 2 +- .../ui/actions/poll/form/AbstractPollForm.java | 2 +- .../pollen/ui/actions/poll/form/ClonePoll.java | 2 +- .../pollen/ui/actions/poll/form/CreatePoll.java | 2 +- .../ui/actions/poll/form/DisplayDateChoice.java | 2 +- .../ui/actions/poll/form/DisplayImageChoice.java | 2 +- .../ui/actions/poll/form/DisplayPersonToList.java | 2 +- .../ui/actions/poll/form/DisplayTextChoice.java | 2 +- .../ui/actions/poll/form/DisplayVotingList.java | 2 +- .../pollen/ui/actions/poll/form/EditPoll.java | 2 +- .../poll/form/ImportPersonListToVotingList.java | 2 +- .../poll/form/SelectPersonListToVotingList.java | 2 +- .../pollen/ui/actions/poll/form/package-info.java | 2 +- .../pollen/ui/actions/poll/package-info.java | 2 +- .../ui/actions/poll/vote/AbstractVoteAction.java | 4 +-- .../pollen/ui/actions/poll/vote/AddChoice.java | 2 +- .../pollen/ui/actions/poll/vote/AddComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteChoice.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteChoice.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteComment.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/ModeratePoll.java | 2 +- .../pollen/ui/actions/poll/vote/VoteForPoll.java | 4 +-- .../pollen/ui/actions/poll/vote/package-info.java | 2 +- .../chorem/pollen/ui/actions/user/AttachPoll.java | 2 +- .../chorem/pollen/ui/actions/user/ChangeLang.java | 2 +- .../org/chorem/pollen/ui/actions/user/Confirm.java | 2 +- .../pollen/ui/actions/user/CreateFavoriteList.java | 2 +- .../ui/actions/user/CreateFavoriteListVoter.java | 2 +- .../pollen/ui/actions/user/DeleteFavoriteList.java | 2 +- .../ui/actions/user/DeleteFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Edit.java | 2 +- .../pollen/ui/actions/user/EditFavoriteList.java | 2 +- .../ui/actions/user/EditFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Login.java | 2 +- .../org/chorem/pollen/ui/actions/user/Logout.java | 2 +- .../pollen/ui/actions/user/LostPassword.java | 2 +- .../chorem/pollen/ui/actions/user/Register.java | 2 +- .../pollen/ui/actions/user/package-info.java | 2 +- .../ui/converters/BooleanIntegerConverter.java | 2 +- .../chorem/pollen/ui/converters/DateConverter.java | 2 +- .../pollen/ui/converters/PollUriConverter.java | 2 +- .../chorem/pollen/ui/converters/package-info.java | 2 +- .../interceptors/PollenFileUploadInterceptor.java | 6 ++-- .../ui/interceptors/PollenSecurityInterceptor.java | 2 +- .../pollen/ui/interceptors/package-info.java | 2 +- .../java/org/chorem/pollen/ui/package-info.java | 2 +- .../org/chorem/pollen/ui/results/package-info.java | 2 +- .../ui/security/AbstractPollenAuthorization.java | 2 +- .../ui/security/PollCreatorAccessRequired.java | 2 +- .../ui/security/PollResultAccessRequired.java | 2 +- .../pollen/ui/security/PollVoteAccessRequired.java | 2 +- .../chorem/pollen/ui/security/package-info.java | 2 +- pollen-ui-struts2/src/main/resources/log4j2.xml | 21 ++++++++++++++ .../resources/template/jquery/theme.properties | 20 +++++++++++++ .../ui/converters/BooleanIntegerConverterTest.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollIT.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollenIT.java | 8 +++--- .../java/org/chorem/pollen/ui/it/CleanDrivers.java | 2 +- .../org/chorem/pollen/ui/it/PollenUrlFixtures.java | 10 +++---- .../chorem/pollen/ui/it/WebDriverResources.java | 2 +- .../strategy/VoteCountingFactoryTest.java | 2 +- pollen-ui-struts2/src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/AbstractVoteCounting.java | 2 +- .../votecounting/AbstractVoteCountingStrategy.java | 2 +- .../chorem/pollen/votecounting/VoteCounting.java | 2 +- .../pollen/votecounting/VoteCountingFactory.java | 2 +- .../pollen/votecounting/VoteCountingNotFound.java | 2 +- .../pollen/votecounting/VoteCountingStrategy.java | 2 +- .../pollen/votecounting/model/ChoiceIdAble.java | 2 +- .../pollen/votecounting/model/ChoiceScore.java | 4 +-- .../votecounting/model/ChoiceToVoteRenderType.java | 4 +-- .../pollen/votecounting/model/GroupOfVoter.java | 2 +- .../votecounting/model/GroupOfVoterBuilder.java | 2 +- .../model/GroupVoteCountingResult.java | 2 +- .../pollen/votecounting/model/SimpleVoter.java | 2 +- .../votecounting/model/SimpleVoterBuilder.java | 2 +- .../votecounting/model/VoteCountingResult.java | 4 +-- .../pollen/votecounting/model/VoteForChoice.java | 2 +- .../chorem/pollen/votecounting/model/Voter.java | 2 +- .../pollen/votecounting/model/VoterBuilder.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../votecounting/BordaVoteCountingStrategy.java | 2 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../CondorcetVoteCountingStrategy.java | 2 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CoombsVoteCounting.java | 2 +- .../votecounting/CoombsVoteCountingStrategy.java | 2 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/InstantRunoffVoteCounting.java | 2 +- .../InstantRunoffVoteCountingStrategy.java | 2 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NormalVoteCounting.java | 2 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +-- .../NormalVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NumberVoteCounting.java | 2 +- .../votecounting/NumberVoteCountingStrategy.java | 2 +- .../NumberVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/PercentageVoteCounting.java | 2 +- .../PercentageVoteCountingStrategy.java | 2 +- .../PercentageVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ pom.xml | 2 +- 292 files changed, 684 insertions(+), 423 deletions(-) rename {pollen-ui-struts2/src/main/java/org/chorem/pollen/ui => pollen-services/src/main/java/org/chorem/pollen}/TopiaTransactionFilter.java (95%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit e75e861aae92cf1997e9f553327eb1f32e76ac19 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Nov 16 15:04:26 2015 +0100 Remove profil (too complicated) --- pollen-ui-struts2/pom.xml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index a8a125a..3a0c8e2 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -102,6 +102,7 @@ <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -391,27 +392,6 @@ <profiles> <profile> - <id>do-release</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <properties> - <env>prod</env> - </properties> - - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - - <profile> <id>assembly</id> <activation> <property> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit c3e47afdd1c8a2c83197800a13af7ca46e4d3f2b Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Nov 16 15:05:01 2015 +0100 Fix java8 javadoc, deps... --- .../pollen/PollenApplicationConfigProvider.java | 2 +- .../org/chorem/pollen/PollenConfiguration.java | 2 +- .../chorem/pollen/PollenConfigurationOption.java | 2 +- .../java/org/chorem/pollen/PollenFunctions.java | 2 +- .../main/java/org/chorem/pollen/PollenIOUtil.java | 2 +- .../chorem/pollen/PollenTechnicalException.java | 2 +- .../pollen/PollenTopiaRootContextFactory.java | 2 +- .../pollen/business/persistence/I18nAble.java | 2 +- .../business/persistence/PersonToListDAOImpl.java | 4 +-- .../business/persistence/PollAccountDAOImpl.java | 4 +-- .../pollen/business/persistence/PollActions.java | 2 +- .../persistence/PollCommentVisibility.java | 2 +- .../business/persistence/PollVoteVisibility.java | 4 +-- .../chorem/pollen/business/persistence/Polls.java | 8 +++--- .../business/persistence/VotingListImpl.java | 2 +- .../business/persistence/AbstractDAOTest.java | 4 +-- .../business/persistence/CommentDAOImplTest.java | 2 +- .../persistence/PersonListDAOImplTest.java | 2 +- .../persistence/PersonToListDAOImplTest.java | 2 +- .../persistence/PollAccountDAOImplTest.java | 2 +- .../business/persistence/PollDAOImplTest.java | 2 +- .../pollen/business/persistence/PollTest.java | 2 +- .../persistence/UserAccountDAOImplTest.java | 2 +- .../business/persistence/VoteDAOImplTest.java | 2 +- pollen-persistence/src/test/resources/log4j2.xml | 21 ++++++++++++++ pollen-services/src/license/THIRD-PARTY.properties | 19 ++++++++----- .../chorem/pollen/PollenApplicationContext.java | 2 +- .../chorem/pollen/PollenUserSecurityContext.java | 14 ++++----- .../org/chorem/pollen}/TopiaTransactionFilter.java | 33 +++++++++++----------- .../org/chorem/pollen/bean/PollDateChoice.java | 2 +- .../org/chorem/pollen/bean/PollImageChoice.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUri.java | 2 +- .../main/java/org/chorem/pollen/bean/PollUrl.java | 2 +- .../migration/PollenMigrationCallback.java | 2 +- .../migration/PollenMigrationCallbackV1_1.java | 2 +- .../migration/PollenMigrationCallbackV1_2.java | 2 +- .../migration/PollenMigrationCallbackV1_3.java | 2 +- .../migration/PollenMigrationCallbackV1_3_1.java | 2 +- .../migration/PollenMigrationCallbackV1_4.java | 2 +- .../migration/PollenMigrationCallbackV1_4_5.java | 2 +- .../migration/PollenMigrationCallbackV1_5.java | 2 +- .../services/DefaultPollenServiceContext.java | 2 +- .../pollen/services/PollenNotifierWorker.java | 2 +- .../org/chorem/pollen/services/PollenService.java | 2 +- .../pollen/services/PollenServiceContext.java | 2 +- .../pollen/services/PollenServiceFactory.java | 2 +- .../pollen/services/PollenServiceFunctions.java | 2 +- .../pollen/services/PollenServiceSupport.java | 2 +- .../FavoriteListAlreadyExistException.java | 2 +- .../exceptions/FavoriteListImportException.java | 2 +- .../exceptions/FavoriteListNotFoundException.java | 2 +- .../FavoriteListNotOwnedByUserException.java | 2 +- .../services/exceptions/InvalidEmailException.java | 2 +- .../ParticipantAlreadyFoundInListException.java | 2 +- .../ParticipantExistWithoutMailException.java | 2 +- .../exceptions/ParticipantNotFoundException.java | 2 +- .../ParticipantNotFoundInListException.java | 2 +- .../services/exceptions/PollAccountNotFound.java | 2 +- .../exceptions/PollAlreadyClosedException.java | 2 +- .../exceptions/PollAlreadyExistException.java | 2 +- .../exceptions/PollChoiceNotFoundException.java | 2 +- .../services/exceptions/PollCommentNotFound.java | 2 +- .../services/exceptions/PollNotFoundException.java | 2 +- .../exceptions/PollVoteNotFoundException.java | 2 +- .../UnauthorizedPollAccessException.java | 2 +- .../exceptions/UserEmailAlreadyUsedException.java | 2 +- .../exceptions/UserInvalidPasswordException.java | 2 +- .../exceptions/UserLoginAlreadyUsedException.java | 2 +- .../services/exceptions/UserNotFoundException.java | 2 +- .../services/exceptions/VoteDoubloonException.java | 2 +- .../exceptions/VoteNotAllowedException.java | 2 +- .../services/exceptions/VoteNotFoundException.java | 2 +- .../pollen/services/impl/PollCommentService.java | 2 +- .../pollen/services/impl/PollExportService.java | 2 +- .../pollen/services/impl/PollFeedService.java | 2 +- .../pollen/services/impl/PollUrlService.java | 2 +- .../services/impl/PollVoteCountingService.java | 4 +-- .../pollen/services/impl/PreventRuleService.java | 2 +- .../pollen/services/impl/SecurityService.java | 2 +- .../pollen/services/AbstractPollenServiceTest.java | 2 +- .../pollen/services/impl/EmailServiceTest.java | 2 +- .../pollen/services/impl/FavoriteServiceTest.java | 2 +- .../pollen/services/impl/PollServiceTest.java | 2 +- .../pollen/services/impl/UserServiceTest.java | 2 +- .../pollen/services/impl/VoteServiceTest.java | 2 +- pollen-services/src/test/resources/log4j2.xml | 21 ++++++++++++++ .../chorem/pollen/ui/it/CreateFreeDatePollIT.java | 4 +-- .../chorem/pollen/ui/it/CreateFreeTextPollIT.java | 4 +-- .../pollen/ui/it/CreateRestrictedTextPollIT.java | 4 +-- .../pollen/ui/it/CreateTextPollForGroupIT.java | 4 +-- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/PollWithCommentIT.java | 2 +- .../chorem/pollen/ui/it/PollWithoutCommentIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../java/org/chorem/pollen/ui/it/AbstractIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../ui/it/freepoll/AnonymousPollByAdminIT.java | 4 +-- .../ui/it/freepoll/AnonymousPollByConnectedIT.java | 4 +-- .../it/freepoll/AnonymousPollByNotConnectedIT.java | 6 ++-- .../ui/it/freepoll/CreatorOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/CreatorOnlyByConnectedIT.java | 4 +-- .../it/freepoll/CreatorOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/EverybodyByAdminIT.java | 4 +-- .../ui/it/freepoll/EverybodyByConnectedIT.java | 4 +-- .../ui/it/freepoll/EverybodyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/freepoll/FreePollTestSuite.java | 2 +- .../pollen/ui/it/freepoll/VoterOnlyByAdminIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByConnectedIT.java | 4 +-- .../ui/it/freepoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../chorem/pollen/ui/it/freepoll/java-info.java | 2 +- .../it/restrictedpoll/AnonymousPollByAdminIT.java | 4 +-- .../restrictedpoll/AnonymousPollByConnectedIT.java | 4 +-- .../AnonymousPollByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/CreatorOnlyByAdminIT.java | 4 +-- .../restrictedpoll/CreatorOnlyByConnectedIT.java | 4 +-- .../CreatorOnlyByNotConnectedIT.java | 4 +-- .../ui/it/restrictedpoll/EverybodyByAdminIT.java | 4 +-- .../it/restrictedpoll/EverybodyByConnectedIT.java | 4 +-- .../restrictedpoll/EverybodyByNotConnectedIT.java | 4 +-- .../it/restrictedpoll/RestrictedPollTestSuite.java | 2 +- .../ui/it/restrictedpoll/VoterOnlyByAdminIT.java | 4 +-- .../it/restrictedpoll/VoterOnlyByConnectedIT.java | 4 +-- .../restrictedpoll/VoterOnlyByNotConnectedIT.java | 4 +-- .../pollen/ui/it/restrictedpoll/java-info.java | 2 +- .../java/org/chorem/pollen/ui/it/LoginSIT.java | 2 +- .../org/chorem/pollen/ui/it/PollenTestSuite.java | 2 +- .../org/chorem/pollen/ui/it/SecurityAccessSIT.java | 24 ++++++++-------- .../src/license/THIRD-PARTY.properties | 30 ++++++++++++-------- .../pollen/ui/PollenApplicationListener.java | 8 +++--- .../java/org/chorem/pollen/ui/PollenSession.java | 2 +- .../pollen/ui/PollenStaticContentLoader.java | 6 ++-- .../pollen/ui/PollenTopiaTransactionFilter.java | 3 +- .../java/org/chorem/pollen/ui/PollenUIUtils.java | 2 +- .../chorem/pollen/ui/actions/FileUploadAware.java | 8 +++--- .../org/chorem/pollen/ui/actions/PageSkin.java | 2 +- .../org/chorem/pollen/ui/actions/PollUriAware.java | 2 +- .../pollen/ui/actions/PollenActionSupport.java | 28 +++++++++--------- .../ui/actions/PollenActionSupportForEdition.java | 2 +- .../ui/actions/PollenActionSupportForVote.java | 2 +- .../pollen/ui/actions/PollenUserSecurityAware.java | 2 +- .../chorem/pollen/ui/actions/admin/Confirm.java | 2 +- .../chorem/pollen/ui/actions/admin/DeleteUser.java | 2 +- .../pollen/ui/actions/admin/ManagePolls.java | 2 +- .../pollen/ui/actions/admin/ManageUsers.java | 2 +- .../pollen/ui/actions/admin/package-info.java | 2 +- .../chorem/pollen/ui/actions/io/GenerateChart.java | 2 +- .../pollen/ui/actions/io/GetPollImageChoice.java | 2 +- .../chorem/pollen/ui/actions/io/package-info.java | 2 +- .../ui/actions/json/AbstractJSONPaginedAction.java | 2 +- .../ui/actions/json/AbstractJSONSimpleAction.java | 2 +- .../pollen/ui/actions/json/GetCreatedPolls.java | 2 +- .../pollen/ui/actions/json/GetFavoriteList.java | 2 +- .../actions/json/GetFavoriteListPollAccount.java | 2 +- .../actions/json/GetFavoriteListPollAccounts.java | 2 +- .../pollen/ui/actions/json/GetFavoriteLists.java | 2 +- .../pollen/ui/actions/json/GetInvitedPolls.java | 2 +- .../ui/actions/json/GetParticipatedPolls.java | 2 +- .../chorem/pollen/ui/actions/json/GetPolls.java | 2 +- .../org/chorem/pollen/ui/actions/json/GetUser.java | 2 +- .../chorem/pollen/ui/actions/json/GetUsers.java | 2 +- .../pollen/ui/actions/json/package-info.java | 2 +- .../org/chorem/pollen/ui/actions/package-info.java | 2 +- .../chorem/pollen/ui/actions/poll/GetPollFeed.java | 2 +- .../pollen/ui/actions/poll/ResultForPoll.java | 2 +- .../pollen/ui/actions/poll/admin/ClosePoll.java | 2 +- .../ui/actions/poll/admin/ConfirmPollAction.java | 2 +- .../pollen/ui/actions/poll/admin/DeletePoll.java | 2 +- .../pollen/ui/actions/poll/admin/ExportPoll.java | 2 +- .../pollen/ui/actions/poll/admin/SummaryPoll.java | 2 +- .../pollen/ui/actions/poll/admin/package-info.java | 2 +- .../actions/poll/form/AbstractDisplayChoice.java | 2 +- .../ui/actions/poll/form/AbstractPollForm.java | 2 +- .../pollen/ui/actions/poll/form/ClonePoll.java | 2 +- .../pollen/ui/actions/poll/form/CreatePoll.java | 2 +- .../ui/actions/poll/form/DisplayDateChoice.java | 2 +- .../ui/actions/poll/form/DisplayImageChoice.java | 2 +- .../ui/actions/poll/form/DisplayPersonToList.java | 2 +- .../ui/actions/poll/form/DisplayTextChoice.java | 2 +- .../ui/actions/poll/form/DisplayVotingList.java | 2 +- .../pollen/ui/actions/poll/form/EditPoll.java | 2 +- .../poll/form/ImportPersonListToVotingList.java | 2 +- .../poll/form/SelectPersonListToVotingList.java | 2 +- .../pollen/ui/actions/poll/form/package-info.java | 2 +- .../pollen/ui/actions/poll/package-info.java | 2 +- .../ui/actions/poll/vote/AbstractVoteAction.java | 4 +-- .../pollen/ui/actions/poll/vote/AddChoice.java | 2 +- .../pollen/ui/actions/poll/vote/AddComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteChoice.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteComment.java | 2 +- .../ui/actions/poll/vote/ConfirmDeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteChoice.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteComment.java | 2 +- .../pollen/ui/actions/poll/vote/DeleteVote.java | 2 +- .../pollen/ui/actions/poll/vote/ModeratePoll.java | 2 +- .../pollen/ui/actions/poll/vote/VoteForPoll.java | 4 +-- .../pollen/ui/actions/poll/vote/package-info.java | 2 +- .../chorem/pollen/ui/actions/user/AttachPoll.java | 2 +- .../chorem/pollen/ui/actions/user/ChangeLang.java | 2 +- .../org/chorem/pollen/ui/actions/user/Confirm.java | 2 +- .../pollen/ui/actions/user/CreateFavoriteList.java | 2 +- .../ui/actions/user/CreateFavoriteListVoter.java | 2 +- .../pollen/ui/actions/user/DeleteFavoriteList.java | 2 +- .../ui/actions/user/DeleteFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Edit.java | 2 +- .../pollen/ui/actions/user/EditFavoriteList.java | 2 +- .../ui/actions/user/EditFavoriteListVoter.java | 2 +- .../org/chorem/pollen/ui/actions/user/Login.java | 2 +- .../org/chorem/pollen/ui/actions/user/Logout.java | 2 +- .../pollen/ui/actions/user/LostPassword.java | 2 +- .../chorem/pollen/ui/actions/user/Register.java | 2 +- .../pollen/ui/actions/user/package-info.java | 2 +- .../ui/converters/BooleanIntegerConverter.java | 2 +- .../chorem/pollen/ui/converters/DateConverter.java | 2 +- .../pollen/ui/converters/PollUriConverter.java | 2 +- .../chorem/pollen/ui/converters/package-info.java | 2 +- .../interceptors/PollenFileUploadInterceptor.java | 6 ++-- .../ui/interceptors/PollenSecurityInterceptor.java | 2 +- .../pollen/ui/interceptors/package-info.java | 2 +- .../java/org/chorem/pollen/ui/package-info.java | 2 +- .../org/chorem/pollen/ui/results/package-info.java | 2 +- .../ui/security/AbstractPollenAuthorization.java | 2 +- .../ui/security/PollCreatorAccessRequired.java | 2 +- .../ui/security/PollResultAccessRequired.java | 2 +- .../pollen/ui/security/PollVoteAccessRequired.java | 2 +- .../chorem/pollen/ui/security/package-info.java | 2 +- pollen-ui-struts2/src/main/resources/log4j2.xml | 21 ++++++++++++++ .../resources/template/jquery/theme.properties | 20 +++++++++++++ .../ui/converters/BooleanIntegerConverterTest.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollIT.java | 2 +- .../org/chorem/pollen/ui/it/AbstractPollenIT.java | 8 +++--- .../java/org/chorem/pollen/ui/it/CleanDrivers.java | 2 +- .../org/chorem/pollen/ui/it/PollenUrlFixtures.java | 10 +++---- .../chorem/pollen/ui/it/WebDriverResources.java | 2 +- .../strategy/VoteCountingFactoryTest.java | 2 +- pollen-ui-struts2/src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/AbstractVoteCounting.java | 2 +- .../votecounting/AbstractVoteCountingStrategy.java | 2 +- .../chorem/pollen/votecounting/VoteCounting.java | 2 +- .../pollen/votecounting/VoteCountingFactory.java | 2 +- .../pollen/votecounting/VoteCountingNotFound.java | 2 +- .../pollen/votecounting/VoteCountingStrategy.java | 2 +- .../pollen/votecounting/model/ChoiceIdAble.java | 2 +- .../pollen/votecounting/model/ChoiceScore.java | 4 +-- .../votecounting/model/ChoiceToVoteRenderType.java | 4 +-- .../pollen/votecounting/model/GroupOfVoter.java | 2 +- .../votecounting/model/GroupOfVoterBuilder.java | 2 +- .../model/GroupVoteCountingResult.java | 2 +- .../pollen/votecounting/model/SimpleVoter.java | 2 +- .../votecounting/model/SimpleVoterBuilder.java | 2 +- .../votecounting/model/VoteCountingResult.java | 4 +-- .../pollen/votecounting/model/VoteForChoice.java | 2 +- .../chorem/pollen/votecounting/model/Voter.java | 2 +- .../pollen/votecounting/model/VoterBuilder.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../votecounting/BordaVoteCountingStrategy.java | 2 +- .../BordaVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../CondorcetVoteCountingStrategy.java | 2 +- .../CondorcetVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/CoombsVoteCounting.java | 2 +- .../votecounting/CoombsVoteCountingStrategy.java | 2 +- .../CoombsVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/InstantRunoffVoteCounting.java | 2 +- .../InstantRunoffVoteCountingStrategy.java | 2 +- .../InstantRunoffVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NormalVoteCounting.java | 2 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +-- .../NormalVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../pollen/votecounting/NumberVoteCounting.java | 2 +- .../votecounting/NumberVoteCountingStrategy.java | 2 +- .../NumberVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ .../votecounting/PercentageVoteCounting.java | 2 +- .../PercentageVoteCountingStrategy.java | 2 +- .../PercentageVoteCountingStrategyTest.java | 2 +- .../votecounting/VoteCountingFactoryTest.java | 2 +- .../src/test/resources/log4j2.xml | 21 ++++++++++++++ pom.xml | 2 +- 291 files changed, 683 insertions(+), 402 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java index d2b7ad8..728db45 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenApplicationConfigProvider.java @@ -33,7 +33,7 @@ import org.nuiton.config.ConfigOptionDef; /** * Application config provider (for site generation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3.1 */ public class PollenApplicationConfigProvider implements ApplicationConfigProvider { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java index ef099ef..c7dfc25 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java @@ -50,7 +50,7 @@ import com.google.common.collect.Lists; /** * Pollen configuration. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenConfiguration { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java index f665c56..24e7cba 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java @@ -37,7 +37,7 @@ import org.nuiton.config.ConfigOptionDef; /** * All Pollen configuration options. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public enum PollenConfigurationOption implements ConfigOptionDef { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java index 2687899..8705ef2 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java @@ -35,7 +35,7 @@ import java.util.Map; /** * Usefull pollen functions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenFunctions { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java index 3fb77b8..48f5e4f 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java @@ -30,7 +30,7 @@ import java.io.File; /** * Some utils IO methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenIOUtil { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java index 752f644..c3c4b9e 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java @@ -23,7 +23,7 @@ package org.chorem.pollen; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenTechnicalException extends RuntimeException { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java index 8f8d07a..c7c3d07 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java @@ -39,7 +39,7 @@ import java.util.Properties; import java.util.Set; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenTopiaRootContextFactory { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java index 4545cde..673b473 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/I18nAble.java @@ -25,7 +25,7 @@ package org.chorem.pollen.business.persistence; /** * Contract to expose a i18n key. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface I18nAble { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java index 1340a04..900db01 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PersonToListDAOImpl.java @@ -27,8 +27,8 @@ import com.google.common.base.Preconditions; /** * Created: 28/03/12 * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <cheit@codelutin.com> + * @author fdesbois <desbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PersonToListDAOImpl<E extends PersonToList> extends PersonToListDAOAbstract<E> { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java index 53db2df..af5eafb 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollAccountDAOImpl.java @@ -43,7 +43,7 @@ public class PollAccountDAOImpl<E extends PollAccount> extends PollAccountDAOAbs * Get a restricted poll account for a given poll (by his {@link Poll#getPollId()}) * using the {@link PollAccount#getAccountId()} of the pollAccount * and/or the {@link PollAccount#getEmail()}. - * <p/> + * * <strong>Note:</strong> {@code accountId} and {@code user} can not * be null at the same time. * @@ -118,7 +118,7 @@ public class PollAccountDAOImpl<E extends PollAccount> extends PollAccountDAOAbs /** * Get the pollAccount of a voter for a given {@code pollId} using his * {@code accountId} or {@code user}. - * <p/> + * * <strong>Note:</strong> {@code accountId} and {@code user} can not * be null at the same time. * diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java index 16305c7..f232852 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollActions.java @@ -25,7 +25,7 @@ package org.chorem.pollen.business.persistence; /** * Enumeration to get all possible actions on poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public enum PollActions { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java index f47fc69..9883d2b 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollCommentVisibility.java @@ -27,7 +27,7 @@ import static org.nuiton.i18n.I18n.n; /** * Define how comment can be shown in a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public enum PollCommentVisibility implements I18nAble { diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java index e25f135..8e14d04 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/PollVoteVisibility.java @@ -27,14 +27,14 @@ import static org.nuiton.i18n.I18n.n; /** * Define how vote can be visible in a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public enum PollVoteVisibility implements I18nAble { /** * Nobody can see vote. - * <p/> + * * This means every votes are anonymous. */ NOBODY(n("pollen.pollVoteVisibilty.nobody"), diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java index 360e7f4..d5ec21b 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/Polls.java @@ -40,16 +40,16 @@ import java.util.Set; /** * Useful methods around {@link Poll}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.6 */ public class Polls { /** * Collect all vote for all voters of the givne poll. - * <p/> + * * The result (a set of simple voters) are stored in a fictiv group of voter. - * <p/> + * * <strong>Note:</strong> Even if the poll is a group type, then no of his * group are used (just collect simple voters with no group linkage). * @@ -73,7 +73,7 @@ public class Polls { /** * Build the group of voter of the poll, using his group to build sub * group of the poll. - * <p/> + * * <strong>Note:</strong> This method can only be used for a group poll. * * @param poll the poll to scan diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java index ce7d7b7..295e383 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java @@ -29,7 +29,7 @@ import java.util.List; /** * Created: 05/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class VotingListImpl extends VotingListAbstract { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java index c23ad36..2f984b0 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java @@ -39,7 +39,7 @@ import java.io.File; /** * Base test for daos. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class AbstractDAOTest { @@ -65,7 +65,7 @@ public class AbstractDAOTest { /** * A new database created for each test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public static class PollenDatabase extends TestWatcher { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java index cba0908..fa3e8e6 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests the {@link CommentDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CommentDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java index e3b1894..ca14d9d 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests the {@link PersonListDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PersonListDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java index 0f8935e..23d0734 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java @@ -30,7 +30,7 @@ import org.nuiton.topia.TopiaContext; /** * Tests the {@link PersonToListDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PersonToListDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java index 099b769..09e760f 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollAccountDAOImplTest.java @@ -33,7 +33,7 @@ import org.nuiton.topia.TopiaException; /** * Test the {@link PollAccountDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAccountDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java index f499f14..2f1e906 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java @@ -38,7 +38,7 @@ import java.util.List; /** * Tests the {@link PollDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java index c4ddc34..f483ee3 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollTest.java @@ -32,7 +32,7 @@ import java.util.Date; /** * Tests the {@link PollImpl} methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java index e57b565..d4f4f2b 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java @@ -33,7 +33,7 @@ import java.util.List; /** * Tests the {@link UserAccountDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class UserAccountDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java index 7556c00..b526b7b 100644 --- a/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java +++ b/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java @@ -34,7 +34,7 @@ import java.util.List; /** * Tests the {@link VoteDAOImpl}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteDAOImplTest extends AbstractDAOTest { diff --git a/pollen-persistence/src/test/resources/log4j2.xml b/pollen-persistence/src/test/resources/log4j2.xml index d31e7d4..2637cb6 100644 --- a/pollen-persistence/src/test/resources/log4j2.xml +++ b/pollen-persistence/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: Persistence + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-services/src/license/THIRD-PARTY.properties b/pollen-services/src/license/THIRD-PARTY.properties index ede0053..ac5fc50 100644 --- a/pollen-services/src/license/THIRD-PARTY.properties +++ b/pollen-services/src/license/THIRD-PARTY.properties @@ -1,17 +1,22 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - AL 2.0 # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License -# - CDDL +# - CDDL + GPLv2 with classpath exception +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License, Version 1.0 # - GNU Affero General Public License version 3 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License -# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -19,16 +24,16 @@ # - MIT License # - MPL 1.1 # - New BSD License +# - Public Domain # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Apr 29 11:02:34 CEST 2013 +#Mon Nov 16 14:38:43 CET 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javassist--javassist--3.11.0.GA=Apache License, version 2.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0 diff --git a/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java b/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java index 929e61c..3a6afc5 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java @@ -31,7 +31,7 @@ import javax.servlet.ServletContext; import java.util.Map; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenApplicationContext { diff --git a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java index 231b4cb..cade5d3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/PollenUserSecurityContext.java @@ -38,7 +38,7 @@ import java.util.Set; /** * To store security context for a given user at each request. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollenUserSecurityContext implements Serializable { @@ -47,7 +47,7 @@ public class PollenUserSecurityContext implements Serializable { /** * Connected user account. - * <p/> + * * Can be {@code null} if user is not connected. */ protected final UserAccount userAccount; @@ -61,14 +61,14 @@ public class PollenUserSecurityContext implements Serializable { /** * Current loaded poll according to the {@link #pollUri}. - * <p/> + * * <strong>Note:</strong> this poll should be used by any action needed it. */ protected Poll poll; /** * User roles on the poll. - * <p/> + * * Loaded by the method {@link #loadUserRoles(SecurityService)}. */ protected Set<PollenUserSecurityRole> userRoles; @@ -182,14 +182,14 @@ public class PollenUserSecurityContext implements Serializable { * To define a security role for a given pollen user which can be * identified by his user account or a accountId. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public enum PollenUserSecurityRole { /** * Creator of the poll. - * <p/> + * * This role can access to everything, but can not vote. */ CREATOR, @@ -197,7 +197,7 @@ public class PollenUserSecurityContext implements Serializable { VOTER, /** * A user that was invited to a restricted poll. - * <p/> + * * It might have alreay voted or not. */ RESTRICTED_VOTER diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java b/pollen-services/src/main/java/org/chorem/pollen/TopiaTransactionFilter.java similarity index 95% rename from pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java rename to pollen-services/src/main/java/org/chorem/pollen/TopiaTransactionFilter.java index a3ecfd8..8bfb887 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/TopiaTransactionFilter.java +++ b/pollen-services/src/main/java/org/chorem/pollen/TopiaTransactionFilter.java @@ -8,21 +8,20 @@ * Copyright (C) 2011 CodeLutin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. + * 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 Lesser Public License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * 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; +package org.chorem.pollen; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -52,7 +51,7 @@ import java.util.Set; * This filter purpose is to inject in the request a transaction from * {@link TopiaContext} and deal with the complete lifecycle of a topia * transaction while a request. - * <p/> + * * The injected transaction will be closed (if was really opened) at the end of * the request. * <h2>Configuration of the filter</h2> @@ -62,40 +61,40 @@ import java.util.Set; * which should never be called on the proxied transaction. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onExcludeMethod(Object, Method, Object[])}. - * <p/> + * * Default implementation of this hook is to throw an exception. * </li> * <li>{@code unusedMethods}: This parameters configure a set of method names * which should be by-pass when the proxied transaction was not still open (via a {@link TopiaContext#beginTransaction()}. * When a such method is called on the transaction then the filter will pass in * the hook {@link #onUnusedMethod(Object, Method, Object[])}. - * <p/> + * * Default implementation of this hook is to not return null values. * </li> * </ul> * <h2>Obtain the transaction</h2> * The (proxied) transaction is pushed as an attribute in the servlet request. - * <p/> + * * The attribute name is defined by field {@link #requestAttributeName} * (default value is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be * changed. - * <p/> + * * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : * <pre> * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); * </pre> - * <p/> + * * If you prefer to not use this nice method, you can also do this: * <pre> * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); * </pre> - * <p/> + * * Or * <pre> * TopiaContext tx = (TopiaContext) request.getAttribute(modifiedAttributeName); * </pre> * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public abstract class TopiaTransactionFilter implements Filter { @@ -132,7 +131,7 @@ public abstract class TopiaTransactionFilter implements Filter { /** * Name of the request attribute where to push the transaction. - * <p/> + * * By default will use value of * {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. * diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java index adb91ea..8ddbaa1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollDateChoice.java @@ -31,7 +31,7 @@ import java.util.Date; * Extends the basic choice to keep the date (will be transformed to name) * (during poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollDateChoice extends ChoiceImpl { diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java index d880bbf..9fa3236 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollImageChoice.java @@ -29,7 +29,7 @@ import org.chorem.pollen.business.persistence.ChoiceImpl; * Extends the basic choice to keep location of uploaded image * (during poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollImageChoice extends ChoiceImpl { diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java index 781489d..a12c241 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUri.java @@ -30,7 +30,7 @@ import java.io.Serializable; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollUri implements Serializable { diff --git a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java index 611f8f2..c508967 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java +++ b/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java @@ -25,7 +25,7 @@ package org.chorem.pollen.bean; /** * Created: 12/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class PollUrl { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java index 2116b8e..b3cea4f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java @@ -32,7 +32,7 @@ import java.util.List; /** * Pollen Migration callback. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallback extends TopiaMigrationCallbackByClassNG { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java index ec1c02a..390d3b3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java @@ -37,7 +37,7 @@ import org.nuiton.util.version.Versions; /** * Migration for version {@code 1.1}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java index a8e2e70..4194c82 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java @@ -37,7 +37,7 @@ import org.nuiton.util.version.Versions; /** * Migration for version {@code 1.2}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java index edc5443..4f20f39 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java @@ -45,7 +45,7 @@ import java.util.Map; /** * Migration for version {@code 1.3}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenMigrationCallbackV1_3 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java index c50cdc0..540d91d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java @@ -38,7 +38,7 @@ import java.util.List; /** * Migration for version {@code 1.3.1}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3.1 */ public class PollenMigrationCallbackV1_3_1 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java index 27ad9f1..75b206b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java @@ -58,7 +58,7 @@ import java.util.Locale; /** * Migration for version {@code 1.4}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollenMigrationCallbackV1_4 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java index 16d94f3..eeba824 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4_5.java @@ -34,7 +34,7 @@ import java.util.List; /** * Migration for version {@code 1.4.5}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollenMigrationCallbackV1_4_5 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java index b39b07f..6bb6bb4 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java +++ b/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_5.java @@ -60,7 +60,7 @@ import java.util.Set; /** * Migration for version {@code 1.4.5.2}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5.2 */ public class PollenMigrationCallbackV1_5 extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java index 975fd9e..fd28e9f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java @@ -35,7 +35,7 @@ import java.util.UUID; /** * Instances of this class will be given to service factory. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DefaultPollenServiceContext implements PollenServiceContext { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java index 92af1df..084a79e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java @@ -44,7 +44,7 @@ import java.util.TimerTask; * This service run as a daemon seek to send some notification from running poll * store in {@link PreventRule}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenNotifierWorker implements Runnable, Closeable { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java index 8162f56..67f4347 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java @@ -27,7 +27,7 @@ package org.chorem.pollen.services; * Contract to place on each EchBase service to push the {@code serviceContext} * inside the service. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PollenServiceContext * @since 1.3 */ diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java index c3a6ad4..5be55e1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java @@ -38,7 +38,7 @@ import java.util.Locale; * Objects provided may be injected in services returned by * {@link PollenServiceFactory#newService(Class, PollenServiceContext)} * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface PollenServiceContext { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java index 24657ff..ced2e21 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java @@ -29,7 +29,7 @@ import java.lang.reflect.InvocationTargetException; /** * Factory of services. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenServiceFactory { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java index 7f77bde..756959b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java @@ -42,7 +42,7 @@ import java.util.List; /** * Usefull functions for the service (and higher) layers. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenServiceFunctions { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java index 7d74d07..91167f3 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java @@ -41,7 +41,7 @@ import java.util.Locale; import static org.nuiton.i18n.I18n.l; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenServiceSupport implements PollenService { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java index 06e4963..416d321 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class FavoriteListAlreadyExistException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java index a820b21..eea63c9 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n; * Exception during favorite list import. There is * always a cause from librairies used for import. * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class FavoriteListImportException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java index 7ee8651..bdd55af 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class FavoriteListNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java index af3f0fc..e022c50 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class FavoriteListNotOwnedByUserException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java index 112fdfb..ca55ea8 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * Created: 13/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public class InvalidEmailException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java index 8e6becb..cc2fb03 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantAlreadyFoundInListException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java index a8b929d..78ab327 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantExistWithoutMailException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java index 42479e2..6430101 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java index 0337098..dc12e02 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ParticipantNotFoundInListException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java index d7b5707..ee02640 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAccountNotFound.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAccountNotFound extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java index 7c7d2ca..193c6bf 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAlreadyClosedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java index 7c8bbf4..4c45dd1 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollAlreadyExistException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java index b9da2e8..96c3475 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollChoiceNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * When a poll choice not found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollChoiceNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java index 6f9f7c1..e0a2e01 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollCommentNotFound.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollCommentNotFound extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java index c002226..db99213 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java index ccc60e4..3f1632e 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollVoteNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * When a pooll vote not found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollVoteNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java index ac88aec..32e5ab2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UnauthorizedPollAccessException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UnauthorizedPollAccessException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java index 4f89559..3fa1433 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserEmailAlreadyUsedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java index 2f45959..39b4b61 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserInvalidPasswordException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java index 2538ae6..8d66b61 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserLoginAlreadyUsedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java index db4e2d5..a879c81 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java index 42304f9..7308bd2 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteDoubloonException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java index 9e6dc36..53c6d3d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteNotAllowedException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java index ba20c57..4b0aa29 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotFoundException.java @@ -25,7 +25,7 @@ package org.chorem.pollen.services.exceptions; /** * When a vote is not found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteNotFoundException extends Exception { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java index 6a174d9..5b28e0b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java @@ -40,7 +40,7 @@ import java.util.List; /** * Manage comments on a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollCommentService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java index 80da6a9..715f83f 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollExportService.java @@ -30,7 +30,7 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; /** * Service to export poll as xml format (or later other formats). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5 */ public class PollExportService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java index 4d3da98..fc5120d 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java @@ -59,7 +59,7 @@ import static org.nuiton.i18n.I18n.l; /** * Service to manage feed of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollFeedService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java index 5d97c95..8a78280 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java @@ -33,7 +33,7 @@ import org.chorem.pollen.services.PollenServiceSupport; /** * Service to deal with url used by application. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollUrlService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java index 701e266..c89453b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java @@ -51,7 +51,7 @@ import java.util.List; /** * New Poll vote counting service. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollVoteCountingService extends PollenServiceSupport { @@ -165,7 +165,7 @@ public class PollVoteCountingService extends PollenServiceSupport { /** * Supprime le 0 final d'un nombre à virgule. Le résultat peut-être un - * double : 1,0 -> 1 et 1,2 -> 1,2. + * double : 1,0 -> 1 et 1,2 -> 1,2. * * @param val le nombre * @return le nombre sans 0 final diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java index 4f32ef0..68ab11b 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java @@ -35,7 +35,7 @@ import java.util.Date; /** * Manage prevent rules of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PreventRuleService extends PollenServiceSupport { diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java b/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java index db6763c..78e9b02 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/impl/SecurityService.java @@ -49,7 +49,7 @@ import static org.nuiton.i18n.I18n.n; /** * Service to manager security. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class SecurityService extends PollenServiceSupport { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java index 4422de4..19e8894 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java @@ -33,7 +33,7 @@ import java.util.Map; * The H2 file is stored in a directory depending on the test class name, the * test method name, and a timestamp (allowing you to run tests multiple times * to see how database changed between each test run). - * <p/> + * * Any unit test of a service should subclass this class and use the * {@link #newService(Class)} to get a service ready to be used. * diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java index 4f5011c..a08d1a1 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * Test {@link EmailService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class EmailServiceTest extends AbstractPollenServiceTest { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java index 486d8e3..1e831cf 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java @@ -38,7 +38,7 @@ import java.util.List; /** * Tests the {@link FavoriteService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ @Ignore diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java index f3d34a2..4d2acb0 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java @@ -31,7 +31,7 @@ import org.nuiton.topia.TopiaException; /** * Tests the {@link PollService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ @Ignore diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java index 8999685..587eff9 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java @@ -38,7 +38,7 @@ import static org.chorem.pollen.services.impl.EmailService.PollenEmail; /** * Tests the {@link UserService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class UserServiceTest extends AbstractPollenServiceTest { diff --git a/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java b/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java index 5a65d74..ae10530 100644 --- a/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java +++ b/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * Tests the {@link VoteService}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class VoteServiceTest extends AbstractPollenServiceTest { diff --git a/pollen-services/src/test/resources/log4j2.xml b/pollen-services/src/test/resources/log4j2.xml index d31e7d4..7b2a2fb 100644 --- a/pollen-services/src/test/resources/log4j2.xml +++ b/pollen-services/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: Services + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java index a2a8f3d..0ee8fac 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeDatePollIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Test the well work of a Free Date poll creation page. - * <p/> + * * Tested cases : * <ul> * <li>Classic creation with filled mandatory fields (a title and at least 2 choices(OK)</li> @@ -42,7 +42,7 @@ import java.util.List; * <li>Classic creation with invalid date format for one of the choices (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateFreeDatePollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java index 1dd96b7..7c725c0 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateFreeTextPollIT.java @@ -35,7 +35,7 @@ import java.util.List; /** * Test the well work of a Free text poll creation page. - * <p/> + * * Tested cases : * <ul> * <li>Classic creation with filled mandatory fields (OK)</li> @@ -51,7 +51,7 @@ import java.util.List; * <li>Classic creation with choice adding ending date after poll ending date (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateFreeTextPollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java index a387cc1..d4d7177 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateRestrictedTextPollIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Test the well work of a text poll creation page with a restricted list of participant. - * <p/> + * * Tested cases : * <ul> * <li>Creation without participant (KO)</li> @@ -42,7 +42,7 @@ import java.util.List; * <li>Creation with a participant with only an email (no name) (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateRestrictedTextPollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java index 0bf9742..40eecf1 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/CreateTextPollForGroupIT.java @@ -32,7 +32,7 @@ import java.util.List; /** * Test the well work of a text poll creation page with the use of groups. - * <p/> + * * Tested cases : * <ul> * <li>Creation with a nonamed group (KO)</li> @@ -45,7 +45,7 @@ import java.util.List; * <li>Creation with two participants with same email in different group (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> + * @author ymartel <martel@codelutin.com> * @since 1.4 */ public class CreateTextPollForGroupIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index 4b93f5a..5e49843 100644 --- a/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java index 083ae87..0fc11fb 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java @@ -32,7 +32,7 @@ import org.openqa.selenium.WebElement; /** * Poll with comment possible. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollWithCommentIT extends AbstractPollIT { diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java index 3d47168..8ddf6de 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java @@ -31,7 +31,7 @@ import org.openqa.selenium.WebElement; /** * Poll with no comment possible. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollWithoutCommentIT extends AbstractPollIT { diff --git a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index 21f0111..1d019e2 100644 --- a/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java index e9665c6..c587645 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/AbstractIT.java @@ -32,7 +32,7 @@ import java.util.Set; /** * Abstrac it for this it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public abstract class AbstractIT extends AbstractPollIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index ef0779d..d5c1bdb 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -30,7 +30,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java index 74b6e2c..c5a55fc 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous free poll created by an administrator. - * <p/> + * * For that poll nobody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java index 03ab80f..7bdb134 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous free poll created by a connected user. - * <p/> + * * For that poll nobody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java index a9076f5..23b9430 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/AnonymousPollByNotConnectedIT.java @@ -29,16 +29,16 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous free poll created by a not connected user. - * <p/> + * * For that poll nobody can see other people votes. - * <p/> + * * Wen have 4 votes: * - creator one * - not connected one * - connected one * - admin one * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java index 26e792a..339fbb1 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only free poll created by an administrator. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java index 884ee31..bbf6d23 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only free poll created by an connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java index bbf5999..326d9f4 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/CreatorOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only free poll created by a not connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java index a3ae4f1..2d8c28a 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody free poll created by a administrator user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java index 8dd66de..7da9e51 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody free poll created by a connected user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java index 8e6f7cc..cd47e0e 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/EverybodyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody free poll created by a not connected user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java index 60e3b08..bd61ab5 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * All tests of this package. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java index a383556..6ff7fe5 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only free poll created by a administrator user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java index c4614cd..efae853 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only free poll created by a connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java index d7d5851..6419e89 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/VoterOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only free poll created by a not connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java index 995a3a6..89e9f3a 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java @@ -24,6 +24,6 @@ package org.chorem.pollen.ui.it.freepoll; /** * To test on free poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java index 4816a89..9407e84 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous restricted poll created by a administrator. - * <p/> + * * For that poll nobody can see other people votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java index 506385d..bcfa962 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous restricted poll created by a connected user. - * <p/> + * * For that poll nobody can see other people votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java index b95c816..cc822e0 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a anonymous restricted poll created by a not connected user. - * <p/> + * * For that poll nobody can see other people votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AnonymousPollByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java index 94ba6d4..e6ef231 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only restricted poll created by an administrator. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java index 84a54b0..f3699b5 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only restricted poll created by an connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java index 085f16d..96308e6 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a creator only restricted poll created by an not connected user. - * <p/> + * * For that poll only creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreatorOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java index 1dbd912..11770bb 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody restricted poll created by an administrator. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java index b09fa33..465da1b 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody restricted poll created by an connected user. - * <p/> + * * For that poll everybody can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java index a613fc4..1686db2 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a everybody restricted poll created by an not connected user. - * <p/> + * * For that poll evrybody, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EverybodyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java index d943076..7ccdccd 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * All tests of this package. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java index 993d885..70c507d 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only restricted poll created by an administrator. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByAdminIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java index e233ac4..52e234c 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a vote only restricted poll created by an connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java index 51bf57c..94bc1e4 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java @@ -29,10 +29,10 @@ import org.openqa.selenium.WebDriver; /** * Test a voter only restricted poll created by an not connected user. - * <p/> + * * For that poll only voter, creator or administrator can see votes. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoterOnlyByNotConnectedIT extends AbstractIT { diff --git a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java index e24600b..61dce0f 100644 --- a/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java +++ b/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java @@ -24,6 +24,6 @@ package org.chorem.pollen.ui.it.restrictedpoll; /** * To test on restricted poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ \ No newline at end of file diff --git a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java index 09df39a..02fe223 100644 --- a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java +++ b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/LoginSIT.java @@ -33,7 +33,7 @@ import java.util.List; /** * Test the login action. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class LoginSIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java index 715b86c..cce9f26 100644 --- a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java +++ b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java @@ -28,7 +28,7 @@ import org.junit.runners.Suite; /** * Tests to execute in that it. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(Suite.class) diff --git a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java index c8f236d..33c37aa 100644 --- a/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java +++ b/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java @@ -28,7 +28,7 @@ import org.openqa.selenium.WebDriver; /** * Test the security on some restricted pages : - * <p/> + * * <ul> * <li>Access to "connected pages" when connected (OK)</li> * <li>Access to "connected pages" when not connected (KO)</li> @@ -42,7 +42,7 @@ import org.openqa.selenium.WebDriver; * <li>Access to "poll moderation page" with a good tokenId (OK)</li> * <li>Access to "poll moderation page" with a bad tokenId (KO)</li> * </ul> - * <p/> + * * TODO ymartel 2012/06/12 * Should check those security access to : * <ul> @@ -50,8 +50,8 @@ import org.openqa.selenium.WebDriver; * <li>Access to "restricted poll page" with a bad accountId (KO)</li> * </ul> * - * @author ymartel <martel@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author ymartel <martel@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class SecurityAccessSIT extends AbstractPollIT { @@ -70,7 +70,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to participatedList page</li> * <li>Try to access to favoriteLists page</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -101,7 +101,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to participatedList page</li> * <li>Try to access to favoriteLists page</li> * </ol> - * <p/> + * * All the page should be redirected to connected_required page. */ @Test @@ -127,7 +127,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * <p/> + * * All the page should be redirected to connected_required page. */ @Test @@ -147,7 +147,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * <p/> + * * All the page should be redirected to admin_required page. */ @Test @@ -170,7 +170,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -197,7 +197,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to modification page for normal poll with good pollId & good tokenId</li> * <li>Try to access to modification page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -236,7 +236,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test @@ -281,7 +281,7 @@ public class SecurityAccessSIT extends AbstractPollIT { * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> - * <p/> + * * All the page should be accessed. */ @Test diff --git a/pollen-ui-struts2/src/license/THIRD-PARTY.properties b/pollen-ui-struts2/src/license/THIRD-PARTY.properties index a75067b..8312a07 100644 --- a/pollen-ui-struts2/src/license/THIRD-PARTY.properties +++ b/pollen-ui-struts2/src/license/THIRD-PARTY.properties @@ -1,23 +1,28 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache License +# - AL 2.0 +# - ASL, version 2 # - Apache License 2.0 +# - Apache License Version 2.0 +# - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - BSD License -# - BSD-style license -# - Bouncy Castle License -# - CDDL +# - CDDL + GPLv2 with classpath exception +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License v1.0 +# - Eclipse Public License, Version 1.0 # - GNU Affero General Public License version 3 # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence -# - GNU Lesser General Public License, version 2.1 +# - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License -# - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 @@ -25,24 +30,25 @@ # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 -# - Mozilla Public License # - Mozilla Public License version 2.0 # - New BSD License +# - Public Domain # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 +# - The PostgreSQL License +# - The SAX License +# - The W3C License # - The W3C Software License -# - license.txt -# - provided without support or warranty #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Apr 29 11:02:35 CEST 2013 +#Mon Nov 16 14:44:06 CET 2015 cglib--cglib-nodep--2.1_3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javassist--javassist--3.11.0.GA=Apache License, version 2.0 jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=The Apache Software License, Version 2.0 diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java index fef2060..9a3aafc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java @@ -65,13 +65,13 @@ import java.util.Map; /** * To listen start or end of the application. - * <p/> + * * On start we will load the configuration and check connection to internal * database, creates schema and create an admin user in none found in database. - * <p/> + * * On stop, just release the application configuration. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenApplicationListener implements ServletContextListener { @@ -185,7 +185,7 @@ public class PollenApplicationListener implements ServletContextListener { /** * Prepare the configuration to be used. - * <p/> + * * <strong>Note:</strong> This method is here mainly to be able to * override configuration for tests environnements. * diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java index 80f351f..a088482 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java @@ -40,7 +40,7 @@ import java.util.Set; /** * User session to put in servlet session. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenSession implements Serializable { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java index fc328f1..74abc8c 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenStaticContentLoader.java @@ -23,7 +23,6 @@ package org.chorem.pollen.ui; * #L% */ - import com.google.common.base.Charsets; import com.opensymphony.xwork2.util.logging.Logger; import com.opensymphony.xwork2.util.logging.LoggerFactory; @@ -37,14 +36,13 @@ import java.io.InputStream; import java.io.OutputStream; import java.util.Calendar; - /** * To fix some javascript loading problem. - * <p/> + * * Some javascript files have some strange first caracter (ckeditor for example) + * problem while loading charsets for french translate files. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5.1 */ public class PollenStaticContentLoader extends DefaultStaticContentLoader { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java index da38da2..55f82a5 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java @@ -25,6 +25,7 @@ package org.chorem.pollen.ui; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; +import org.chorem.pollen.TopiaTransactionFilter; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; @@ -37,7 +38,7 @@ import javax.servlet.ServletRequest; /** * Pollen implementation of the {@link TopiaTransactionFilter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenTopiaTransactionFilter extends TopiaTransactionFilter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java index a5736ba..c58084f 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.l_; /** * Useful ui methods. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenUIUtils { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java index 2ddc62d..812c065 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/FileUploadAware.java @@ -28,14 +28,14 @@ import java.io.File; /** * Contract to place on actions which needs some upload. - * <p/> + * * This is linked with the {@link PollenFileUploadInterceptor} interceptor * which logic is not the same than the bacis struts2 upload interceptor. - * <p/> + * * Created: 30/03/12 * - * @author fdesbois <desbois@codelutin.com> - * @author tchemit <chemit@codelutin.com> + * @author fdesbois <desbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public interface FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java index c7c9faa..6e82887 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions; /** * Created: 13/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public enum PageSkin { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java index 3414521..489fd20 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollUriAware.java @@ -27,7 +27,7 @@ import org.chorem.pollen.bean.PollUri; /** * For any action that contains a {@link PollUri} context. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java index ad32068..ea89800 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java @@ -36,6 +36,7 @@ import org.apache.struts2.interceptor.ServletRequestAware; import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenUserSecurityContext; +import org.chorem.pollen.TopiaTransactionFilter; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.Polls; @@ -56,7 +57,6 @@ 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.PollenSession; -import org.chorem.pollen.ui.TopiaTransactionFilter; import org.chorem.pollen.ui.interceptors.PollenSecurityInterceptor; import org.chorem.pollen.ui.security.AbstractPollenAuthorization; import org.chorem.pollen.votecounting.VoteCounting; @@ -72,13 +72,13 @@ import com.opensymphony.xwork2.inject.Inject; /** * Pollen action support. - * <p/> + * * <b>Note :</b> All actions must implement this class to have a better i18n * support, when a i18n key is not translated it has a empty translation and * we do NOT want this behaviour in gui, prefer to return the marked * untranslated key. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenActionSupport extends BaseAction implements ServletRequestAware { @@ -100,7 +100,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Provides a way to get a service. - * <p/> + * * Actions may <strong>not</strong> call it directly by use * {@link #getService(Class)} instead. */ @@ -123,7 +123,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * All the parameters send by request used to build back choices of the * poll. - * <p/> + * * This will be setted by the {@link ParameterAware#setParameters(Map)} as soon * as your action implements {@link ParameterAware}. * @@ -133,12 +133,12 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * The user security context for this request. - * <p/> + * * This security contains the {@code poll}, {@code userAccount} and {@code userRoles}. - * <p/> + * * It will be injected by the {@link PollenSecurityInterceptor} for all * action which implements {@link PollenUserSecurityAware}. - * <p/> + * * <strong>Import Note:</strong> Security context is load by shiro filter * via method {@link AbstractPollenAuthorization#createSecurityContext(ServletRequest)}. * @@ -214,7 +214,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Keep in this action the incoming request parameters. - * <p/> + * * <strong>Note:</strong> This method will be invoked only if your action * implements the {@link ParameterAware} contract. * @@ -229,7 +229,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Keep in this action the incoming security context. - * <p/> + * * <strong>Note:</strong> This method will be invoked only if your action * implements the {@link PollenUserSecurityAware} contract. * @@ -244,7 +244,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Gets the {@link PollUri} from the incoming request. - * <p/> + * * If the action is {@link PollenUserSecurityAware}, then will take it * from {@link PollenUserSecurityContext#getPollUri()}, otherwise will * return {@code null} (this means you must override this method in your action. @@ -418,7 +418,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Tests if the incoming http request is a get method. - * <p/> + * * <strong>Note:</strong> {@link #request} must not be null. * * @return {@code true} if incoming request uses {@code GET} method. @@ -431,7 +431,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Obtain the injected security context. - * <p/> + * * <strong>Note:</strong> {@link #securityContext} must not be null * (concrete action should implements {@link PollenUserSecurityAware}). * @@ -447,7 +447,7 @@ public class PollenActionSupport extends BaseAction implements ServletRequestAwa /** * Obtain the injected request parameters. - * <p/> + * * <strong>Note:</strong> {@link #parameters} must not be null * (concrete action should implements {@link ParameterAware}). * diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java index 3d3f191..819de24 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForEdition.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions; /** * Base action support with predefined edition skin. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PageSkin#EDITION * @since 1.4.5 */ diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java index 5db41ff..f469513 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupportForVote.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions; /** * Base action support with predefined vote skin. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PageSkin#VOTE * @since 1.4.5 */ diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java index a73a111..ceb2b24 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenUserSecurityAware.java @@ -27,7 +27,7 @@ import org.chorem.pollen.PollenUserSecurityContext; /** * Contract of action which use {@link PollenUserSecurityContext}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java index b9855e6..56110c5 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Action for confirmation * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Confirm extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java index f67cdf8..27e5cad 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/DeleteUser.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Delete a selected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteUser extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java index 9aeec0d..c7e2da9 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions.admin; import org.chorem.pollen.ui.actions.PollenActionSupport; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ManagePolls extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java index 25e4f21..325209b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.util.StringUtil; /** - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ManageUsers extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java index 62928a7..84f8667 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/package-info.java @@ -3,7 +3,7 @@ * * All actions coming from the admin menu should be placed here. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.admin; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java index 55726f3..e846378 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GenerateChart.java @@ -44,7 +44,7 @@ import java.util.List; /** * Action to generate a chart given the values (and optional subtitles). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GenerateChart extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java index 23d3e77..8e75fa0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java @@ -36,7 +36,7 @@ import java.net.URLDecoder; /** * Obtain the image choice of a given choice of an image-like poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetPollImageChoice extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java index 5def77f..30a010d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all io actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.io; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java index df02e22..a47130f 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Abstract JSON action with pagination support. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public abstract class AbstractJSONPaginedAction extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java index beef7d0..97a3273 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONSimpleAction.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Abstract JSON action for a simple result (one row). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.5 */ public abstract class AbstractJSONSimpleAction extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java index 5a0c87c..d07b9cb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java @@ -37,7 +37,7 @@ import java.util.Set; /** * Obtain created polls to put in grid for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetCreatedPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java index 49c38d4..c614085 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Get given favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteList extends AbstractJSONSimpleAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java index 40d1dea..86a31b4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Get pagined list of poll accounts of a given favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteListPollAccount extends AbstractJSONSimpleAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java index a472193..fa06357 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Get pagined list of poll accounts of a given favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteListPollAccounts extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java index cb7bf19..b3a748b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Get pagined list of favorite lists of the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetFavoriteLists extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java index 41d967a..4cf895d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Obtain invited polls to put in grid for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetInvitedPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java index a439b59..ce39157 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Obtain participated polls to put in grid for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetParticipatedPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java index b24c4f1..4f32309 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Obtain paginated users. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetPolls extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java index cbc5090..43916c4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Get user datas. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetUser extends AbstractJSONSimpleAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java index 2a6955f..d601a3b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java @@ -34,7 +34,7 @@ import java.util.Set; /** * Obtain paginated users. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetUsers extends AbstractJSONPaginedAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java index c839233..4fde757 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all json actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.json; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java index aea2a41..d6d4de9 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for all actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java index 48a7bee..251eec7 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/GetPollFeed.java @@ -32,7 +32,7 @@ import java.io.InputStream; /** * Obtain the feed of a given poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class GetPollFeed extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java index b948651..0c9b437 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java @@ -59,7 +59,7 @@ import java.util.Set; /** * Display results of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ResultForPoll extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java index cb08e64..55490e6 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ClosePoll.java @@ -33,7 +33,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * Closes an existing poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ClosePoll extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java index ead5bcd..e8c0515 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ConfirmPollAction.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm a poll action (such as delete or close). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmPollAction extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java index 67f4083..ddd8bb1 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/DeletePoll.java @@ -33,7 +33,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * Deletes an existing poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeletePoll extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java index ac7eeab..a8ba0aa 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/ExportPoll.java @@ -31,7 +31,7 @@ import java.io.InputStream; /** * Exports an existing poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ExportPoll extends PollenActionSupport implements PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java index 09feb26..a8e2d90 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/SummaryPoll.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * Action to display summary of a poll for his creator (or an admin). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class SummaryPoll extends PollenActionSupport implements PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java index 2974b5b..1a4351a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/admin/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all poll admin actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll.admin; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java index 0511edb..43fb47e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractDisplayChoice.java @@ -32,7 +32,7 @@ import java.util.Map; /** * To generate the display for a text choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public abstract class AbstractDisplayChoice extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java index 2902900..453ec71 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/AbstractPollForm.java @@ -86,7 +86,7 @@ import java.util.regex.Pattern; /** * Created: 04/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * $Id$ */ public abstract class AbstractPollForm extends PollenActionSupportForEdition implements Preparable, ParameterAware, FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java index 0ddd820..4a770bf 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ClonePoll.java @@ -29,7 +29,7 @@ import java.util.Date; /** * Clones a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class ClonePoll extends AbstractPollForm { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java index 1ed1993..c1040b2 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/CreatePoll.java @@ -29,7 +29,7 @@ import java.util.Date; /** * Creates a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class CreatePoll extends AbstractPollForm { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java index adbec7f..9506e0a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayDateChoice.java @@ -27,7 +27,7 @@ import org.chorem.pollen.bean.PollDateChoice; /** * To generate the display for a date choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayDateChoice extends AbstractDisplayChoice { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java index abafaad..24eef21 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayImageChoice.java @@ -28,7 +28,7 @@ import org.chorem.pollen.business.persistence.Choice; /** * To generate the display for a image choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayImageChoice extends AbstractDisplayChoice { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java index 55b7f52..6bcb888 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayPersonToList.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To display a personToList (use at a poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayPersonToList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java index 10592fe..239e632 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayTextChoice.java @@ -28,7 +28,7 @@ import org.chorem.pollen.business.persistence.ChoiceImpl; /** * To generate the display for a text choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayTextChoice extends AbstractDisplayChoice { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java index 9bbd359..fea8272 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/DisplayVotingList.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To display a voting list of a poll (use at a poll creation). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DisplayVotingList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java index 476db85..4c1769b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/EditPoll.java @@ -31,7 +31,7 @@ import java.util.Date; * Edit a poll (load it via {@link #input()}), and save it * via {@link #execute()}). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class EditPoll extends AbstractPollForm { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java index aaa67e1..f12feeb 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/ImportPersonListToVotingList.java @@ -34,7 +34,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Load in session a personToList to import into a votingList. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ImportPersonListToVotingList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java index 5dcdbfa..ce99bb1 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/SelectPersonListToVotingList.java @@ -34,7 +34,7 @@ import java.util.Map; /** * Select a person list to add into an existing voting list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class SelectPersonListToVotingList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java index c2db1bb..6c08081 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/form/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all poll form actions (create, clone and edit poll). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll.form; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java index 5109c18..33e1567 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all poll actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java index 023b0d4..6139f85 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AbstractVoteAction.java @@ -59,8 +59,8 @@ import java.util.List; /** * Abstract action for actions on the vote poll page. * - * @author tchemit <chemit@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @since 1.3 */ public abstract class AbstractVoteAction extends PollenActionSupport implements ParameterAware, PollUriAware, PollenUserSecurityAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java index 1a84f28..c32dd9d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddChoice.java @@ -38,7 +38,7 @@ import java.io.File; /** * To add a poll comment. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class AddChoice extends AbstractVoteAction implements Preparable, FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java index 96f7dc7..2e50761 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/AddComment.java @@ -30,7 +30,7 @@ import org.chorem.pollen.business.persistence.Comment; /** * To add a poll comment. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class AddComment extends AbstractVoteAction implements Preparable { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java index 807772e..3e73628 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteChoice.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm delete of a poll choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmDeleteChoice extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java index 85c4392..72ab77a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteComment.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm a comment delete. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmDeleteComment extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java index ab20492..0348285 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ConfirmDeleteVote.java @@ -32,7 +32,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To confirm delete of a poll vote * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class ConfirmDeleteVote extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java index 2b69f0b..acb6520 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteChoice.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To delete a poll choice * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteChoice extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java index 4d6de48..a917a2a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteComment.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To delete a poll comment. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteComment extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java index bd3af5e..54cd927 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/DeleteVote.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenUserSecurityAware; /** * To delete a poll vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteVote extends PollenActionSupport implements PollenUserSecurityAware, PollUriAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java index d4d7507..5b2e734 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/ModeratePoll.java @@ -25,7 +25,7 @@ package org.chorem.pollen.ui.actions.poll.vote; /** * To moderate votes and comment of a given poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class ModeratePoll extends AbstractVoteAction { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java index 866358e..ddc2914 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java @@ -40,8 +40,8 @@ import static org.nuiton.i18n.I18n.n; /** * Votes to a poll. * - * @author tchemit <chemit@codelutin.com> - * @author fdesbois <fdesbois@codelutin.com> + * @author tchemit <chemit@codelutin.com> + * @author fdesbois <fdesbois@codelutin.com> * @since 1.3 */ public class VoteForPoll extends AbstractVoteAction implements Preparable { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java index a1c181e..27e17f1 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/package-info.java @@ -2,7 +2,7 @@ * Base Package for the all poll vote actions (means all actions specific to * the vote page). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.poll.vote; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java index 0bf78f2..50b24fc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/AttachPoll.java @@ -34,7 +34,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To attach a anonymous poll to a connected user account. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class AttachPoll extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java index 8bd671f..0ef8e4a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ChangeLang.java @@ -27,7 +27,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * To change lang and redirect to current page. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class ChangeLang extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java index 6a937f3..5e5f3fc 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Action for confirmation * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Confirm extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java index 703750c..cd0da90 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteList.java @@ -40,7 +40,7 @@ import java.util.List; /** * To create a new favorite list. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreateFavoriteList extends PollenActionSupportForEdition implements FileUploadAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java index edc5285..2de00fe 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/CreateFavoriteListVoter.java @@ -37,7 +37,7 @@ import org.nuiton.util.StringUtil; /** * Creates a new {@link PollAccount} inside a selected {@link PersonList}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CreateFavoriteListVoter extends PollenActionSupportForEdition implements Preparable, ParameterAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java index e1acef2..1c97e2b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteList.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Delete a selected favorite list for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteFavoriteList extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java index d6a6a5f..5ed4e7a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/DeleteFavoriteListVoter.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Delete a selected favorite list for the connected user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class DeleteFavoriteListVoter extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java index 3fa31f1..1a6fab9 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java @@ -33,7 +33,7 @@ import org.nuiton.util.StringUtil; /** * Update a user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Edit extends PollenActionSupportForEdition { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java index 5934262..f12a8ef 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteList.java @@ -30,7 +30,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupportForEdition; /** * Edit a given {@link PersonList}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EditFavoriteList extends PollenActionSupportForEdition { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java index e7c3e37..2f673d5 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/EditFavoriteListVoter.java @@ -37,7 +37,7 @@ import org.nuiton.util.StringUtil; /** * Edits a {@link PollAccount} inside a selected {@link PersonList}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class EditFavoriteListVoter extends PollenActionSupportForEdition implements Preparable, ParameterAware { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java index fd960a0..1a039e0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java @@ -31,7 +31,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Login user to pollen. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Login extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java index 947bb1f..e7f0674 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java @@ -27,7 +27,7 @@ import org.chorem.pollen.ui.actions.PollenActionSupport; /** * Logout from pollen. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Logout extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java index a9dc2f9..58269a7 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java @@ -30,7 +30,7 @@ import org.nuiton.util.StringUtil; /** * Created: 13/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public class LostPassword extends PollenActionSupport { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java index 8256f1e..381cf3f 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java @@ -33,7 +33,7 @@ import org.nuiton.util.StringUtil; /** * Register a new user. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class Register extends PollenActionSupportForEdition { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java index ad10bac..814daaa 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the all user actions. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui.actions.user; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java index 8be4681..ae5e15a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/BooleanIntegerConverter.java @@ -30,7 +30,7 @@ import java.util.Map; /** * Created: 26/03/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class BooleanIntegerConverter extends StrutsTypeConverter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java index 4958284..3e4b030 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java @@ -39,7 +39,7 @@ import static org.nuiton.i18n.I18n.l_; /** * Created: 18/04/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> * @since 1.3 */ public class DateConverter extends StrutsTypeConverter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java index 0f1bac7..01ff677 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/PollUriConverter.java @@ -31,7 +31,7 @@ import java.util.Map; /** * Created: 27/03/12 * - * @author fdesbois <desbois@codelutin.com> + * @author fdesbois <desbois@codelutin.com> */ public class PollUriConverter extends StrutsTypeConverter { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java index 1219fd5..adffa5a 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the converters used in ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see StrutsTypeConverter */ package org.chorem.pollen.ui.converters; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java index ba8f8d4..6e5270e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenFileUploadInterceptor.java @@ -42,14 +42,14 @@ import java.util.regex.Pattern; /** * Overrides the default file upload interceptor to be able to match uploaded * files in specific fields. - * <p/> + * * We want to put upload files in a list (field is file for example) and then * fileName in another list but the default interceptor does not accept this * since it suffix the filename field with FileName... - * <p/> + * * TODO tchemit 2012-03-05 submit a patch to struts guys to avoid this fork. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.3 */ public class PollenFileUploadInterceptor extends FileUploadInterceptor { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java index 2c95b40..1b5d680 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/PollenSecurityInterceptor.java @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletRequest; * Interceptor to inject the {@link PollenUserSecurityContext} for * {@link PollenUserSecurityAware}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see PollenUserSecurityAware * @see PollenUserSecurityContext * @since 1.4.5 diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java index 85c9022..aecacb0 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the interceptors used in ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see Interceptor */ package org.chorem.pollen.ui.interceptors; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java index 9c874ed..f94c71e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> */ package org.chorem.pollen.ui; /* diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java index 4bfa50f..d03fea8 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/results/package-info.java @@ -1,7 +1,7 @@ /** * Base Package for the results used in ui module. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see StrutsResultSupport */ package org.chorem.pollen.ui.results; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java index 736d98d..35d0a2e 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java @@ -43,6 +43,7 @@ import org.apache.shiro.web.filter.authz.AuthorizationFilter; import org.apache.shiro.web.util.WebUtils; import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenUserSecurityContext; +import org.chorem.pollen.TopiaTransactionFilter; import org.chorem.pollen.bean.PollUri; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; @@ -53,7 +54,6 @@ import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.ui.PollenSession; import org.chorem.pollen.ui.PollenUIUtils; -import org.chorem.pollen.ui.TopiaTransactionFilter; import org.nuiton.topia.TopiaContext; import com.google.common.base.Preconditions; diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java index 3890250..cf94184 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Check that a user can show results of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java index 1df874d..6e0aec4 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Check that a user can show results of a poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollResultAccessRequired extends AbstractPollenAuthorization { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java index c2ed4f3..b2fd002 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java @@ -34,7 +34,7 @@ import static org.nuiton.i18n.I18n.n_; /** * Check that a user can vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class PollVoteAccessRequired extends AbstractPollenAuthorization { diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java index 057573f..6d7f67b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/package-info.java @@ -3,7 +3,7 @@ * * Security is done using shiro {@link AccessControlFilter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @see AccessControlFilter */ package org.chorem.pollen.ui.security; diff --git a/pollen-ui-struts2/src/main/resources/log4j2.xml b/pollen-ui-struts2/src/main/resources/log4j2.xml index 5240491..e4f898f 100644 --- a/pollen-ui-struts2/src/main/resources/log4j2.xml +++ b/pollen-ui-struts2/src/main/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: UI (struts2) + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Properties> <Property name="pollen.log.dir">/tmp</Property> diff --git a/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties index db3f7aa..6518208 100644 --- a/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties +++ b/pollen-ui-struts2/src/main/resources/template/jquery/theme.properties @@ -1 +1,21 @@ +### +# #%L +# Pollen :: UI (struts2) +# %% +# Copyright (C) 2009 - 2015 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% +### parent = css_xhtml \ No newline at end of file diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java index 0662611..aa1d46e 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/converters/BooleanIntegerConverterTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link BooleanIntegerConverter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class BooleanIntegerConverterTest { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java index c637c7a..7cd695f 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollIT.java @@ -29,7 +29,7 @@ import org.openqa.selenium.WebDriver; /** * Base class test for a it on a specific poll. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class AbstractPollIT extends AbstractPollenIT { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java index 4cd5d75..3aac3ef 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java @@ -45,7 +45,7 @@ import java.util.List; /** * Base it test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @RunWith(value = Parameterized.class) @@ -182,7 +182,7 @@ public abstract class AbstractPollenIT { /** * Set a value for a WebElement. - * <p/> + * * This operations does 3 steps : * <ul> * <li>Get the WebElement thanks to its id (given in parameter)</li> @@ -198,7 +198,7 @@ public abstract class AbstractPollenIT { /** * Set a value for a WebElement. - * <p/> + * * This operations does 3 steps : * <ul> * <li>Get the WebElement thanks to its name (given in parameter)</li> @@ -215,7 +215,7 @@ public abstract class AbstractPollenIT { /** * Set a value for a WebElement. - * <p/> + * * This operations does 3 steps : * <ul> * <li>Get the WebElement thanks to a {@link By} locator</li> diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java index 8b8a074..2135b96 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java @@ -29,7 +29,7 @@ import org.junit.Test; /** * A dummy test to close any used drivers while its. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CleanDrivers { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java index 660d027..63a04be 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/PollenUrlFixtures.java @@ -31,7 +31,7 @@ import org.chorem.pollen.bean.PollUri; /** * All urls useables by a test. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PollenUrlFixtures { @@ -42,7 +42,7 @@ public class PollenUrlFixtures { /** * Define all urls useables in tests (and in application). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ private static enum POLLEN_URL { @@ -109,12 +109,12 @@ public class PollenUrlFixtures { /** * The base url of the application. - * <p/> + * * This url contains also the web context. This url is obtain from * the configuration. - * <p/> + * * Example: - * <p/> + * * <pre>http://localhost:8765/pollen</pre> * * @see PollenConfiguration#getApplicationUrl() diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java index ef8affa..db64466 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java @@ -40,7 +40,7 @@ import java.util.Map; /** * Web driver resource. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4 */ public class WebDriverResources extends TestWatcher { diff --git a/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java b/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java index e62f266..30ff97c 100644 --- a/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java +++ b/pollen-ui-struts2/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingFactoryTest.java @@ -38,7 +38,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-ui-struts2/src/test/resources/log4j2.xml b/pollen-ui-struts2/src/test/resources/log4j2.xml index cc4556f..3f6e9de 100644 --- a/pollen-ui-struts2/src/test/resources/log4j2.xml +++ b/pollen-ui-struts2/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: UI (struts2) + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java index 4ced60d..dc54006 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCounting.java @@ -30,7 +30,7 @@ import static org.nuiton.i18n.I18n.l; /** * Base abstract implementation of a {@link VoteCounting}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public abstract class AbstractVoteCounting<S extends VoteCountingStrategy> implements VoteCounting<S> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java index 81906ad..9e22d69 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java @@ -47,7 +47,7 @@ import java.util.Set; /** * Base abstract implementation of a {@link VoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public abstract class AbstractVoteCountingStrategy implements VoteCountingStrategy { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java index 97b2423..6ee7e7b 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCounting.java @@ -30,7 +30,7 @@ import java.util.Locale; /** * Contract of a vote counting. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public interface VoteCounting<S extends VoteCountingStrategy> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java index a361341..0b5ffcc 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingFactory.java @@ -35,7 +35,7 @@ import java.util.ServiceLoader; /** * Factory of {@link VoteCounting}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class VoteCountingFactory implements Iterable<VoteCounting> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java index 5ac7607..f713119 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingNotFound.java @@ -25,7 +25,7 @@ package org.chorem.pollen.votecounting; /** * Exception when a vote counting could not be found. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingNotFound extends RuntimeException { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java index 306b372..6a4598c 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java @@ -32,7 +32,7 @@ import java.util.Set; /** * Strategy of a vote counting. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface VoteCountingStrategy { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java index 2879cd1..12bf155 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java @@ -28,7 +28,7 @@ import com.google.common.base.Function; * To mark any object that identify a choice via the {@link #getChoiceId()} * method. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface ChoiceIdAble { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java index ed9b5c9..dca615a 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java @@ -29,11 +29,11 @@ import java.math.BigDecimal; /** * Score for a given choice. - * <p/> + * * Rank is given by the field {@link #scoreOrder} and this class is * comparable of this data. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class ChoiceScore implements ChoiceIdAble, Comparable<ChoiceScore>, Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java index a6f2e2e..d635e97 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java @@ -25,14 +25,14 @@ package org.chorem.pollen.votecounting.model; /** * To define how to render a vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public enum ChoiceToVoteRenderType { /** * To render as a check box. - * <p/> + * * If check box is checked, then result should be value 1, otherwise * result will be null. */ diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java index c6d8225..cdc5acd 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java @@ -31,7 +31,7 @@ import java.util.Set; /** * Group of voters. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class GroupOfVoter implements Voter, Iterable<Voter> { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java index 17dfe9c..db6d430 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoterBuilder.java @@ -31,7 +31,7 @@ import java.util.Set; /** * {@link GroupOfVoter} builder. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.6 */ public class GroupOfVoterBuilder implements VoterBuilder { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java index a0e2071..9addecb 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java @@ -33,7 +33,7 @@ import java.util.Set; /** * TODO * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class GroupVoteCountingResult implements Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java index e01416e..8beb327 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java @@ -29,7 +29,7 @@ import java.util.Set; /** * Physical voter. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class SimpleVoter implements Voter { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java index 7d58741..8ade619 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoterBuilder.java @@ -31,7 +31,7 @@ import java.util.Set; /** * {@link SimpleVoter} builder. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.6 */ public class SimpleVoterBuilder implements VoterBuilder { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java index 8104028..1bb9394 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java @@ -32,7 +32,7 @@ import java.util.List; /** * Contains results for a vote. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingResult implements Serializable { @@ -41,7 +41,7 @@ public class VoteCountingResult implements Serializable { /** * Results for each choice. - * <p/> + * * <strong>Note:</strong> Natural order is used to describe choice scores * (first is winner,...). */ diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java index 7db1d7d..fcdbf0d 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteForChoice.java @@ -27,7 +27,7 @@ import java.io.Serializable; /** * A vote for a choice. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteForChoice implements ChoiceIdAble, Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java index e616f52..5617075 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java @@ -28,7 +28,7 @@ import java.util.Set; /** * A voter (can be a physical voter or a group of voters). * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface Voter extends Serializable { diff --git a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java index 76432e6..c29794f 100644 --- a/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java +++ b/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java @@ -27,7 +27,7 @@ import java.util.Set; /** * To build some {@link Voter}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public interface VoterBuilder { diff --git a/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index b3870df..7b20d25 100644 --- a/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-api/src/test/resources/log4j2.xml b/pollen-votecounting-api/src/test/resources/log4j2.xml index cc4556f..c432c30 100644 --- a/pollen-votecounting-api/src/test/resources/log4j2.xml +++ b/pollen-votecounting-api/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting (Api) + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java index 1838e2e..fa8cf39 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Borda vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class BordaVoteCounting extends AbstractVoteCounting<BordaVoteCountingStrategy> { diff --git a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java index 776b5b6..3af164d 100644 --- a/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java +++ b/pollen-votecounting-borda/src/main/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategy.java @@ -35,7 +35,7 @@ import java.util.Set; /** * Condorcet. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class BordaVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java index 6a0de2c..e319904 100644 --- a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java +++ b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/BordaVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link BordaVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class BordaVoteCountingStrategyTest { diff --git a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 1c4949a..3817eb3 100644 --- a/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-borda/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-borda/src/test/resources/log4j2.xml b/pollen-votecounting-borda/src/test/resources/log4j2.xml index cc4556f..37ee670 100644 --- a/pollen-votecounting-borda/src/test/resources/log4j2.xml +++ b/pollen-votecounting-borda/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Borda + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java index e2ad38b..88832ba 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class CondorcetVoteCounting extends AbstractVoteCounting<CondorcetVoteCountingStrategy> { diff --git a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java index b6ba31c..6aa8e50 100644 --- a/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java +++ b/pollen-votecounting-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategy.java @@ -35,7 +35,7 @@ import java.util.Set; /** * Condorcet. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CondorcetVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java index a538fe4..3a0974d 100644 --- a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java +++ b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link CondorcetVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CondorcetVoteCountingStrategyTest { diff --git a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 6bd8049..e167560 100644 --- a/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-condorcet/src/test/resources/log4j2.xml b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml index cc4556f..35eb876 100644 --- a/pollen-votecounting-condorcet/src/test/resources/log4j2.xml +++ b/pollen-votecounting-condorcet/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Condorcet + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java index e8f78d2..bf931e7 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class CoombsVoteCounting extends AbstractVoteCounting<CoombsVoteCountingStrategy> { diff --git a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java index 241329d..d39bbae 100644 --- a/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java +++ b/pollen-votecounting-coombs/src/main/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategy.java @@ -40,7 +40,7 @@ import java.util.Set; /** * Coombs vote counting strategy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class CoombsVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java index 8a8a2cf..9fcf74d 100644 --- a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java +++ b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/CoombsVoteCountingStrategyTest.java @@ -43,7 +43,7 @@ import java.util.Set; /** * Tests the {@link CoombsVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @Ignore diff --git a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 4079031..a0aa055 100644 --- a/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-coombs/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-coombs/src/test/resources/log4j2.xml b/pollen-votecounting-coombs/src/test/resources/log4j2.xml index cc4556f..4c8dc89 100644 --- a/pollen-votecounting-coombs/src/test/resources/log4j2.xml +++ b/pollen-votecounting-coombs/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Coombs + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java index a18dc21..eef62bb 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class InstantRunoffVoteCounting extends AbstractVoteCounting<InstantRunoffVoteCountingStrategy> { diff --git a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java index d57d4f5..e1b4c84 100644 --- a/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java +++ b/pollen-votecounting-instant-runoff/src/main/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategy.java @@ -39,7 +39,7 @@ import java.util.Set; /** * InstantRunoff. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class InstantRunoffVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java index 49c1271..7d7f126 100644 --- a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java +++ b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/InstantRunoffVoteCountingStrategyTest.java @@ -43,7 +43,7 @@ import java.util.Set; /** * Tests the {@link InstantRunoffVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ @Ignore diff --git a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index c5ab990..f17735e 100644 --- a/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-instant-runoff/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml index cc4556f..6c99cb0 100644 --- a/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml +++ b/pollen-votecounting-instant-runoff/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Instant Runoff + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java index 9ace647..36a028a 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCounting.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class NormalVoteCounting extends AbstractVoteCounting<NormalVoteCountingStrategy> { diff --git a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java index 0c28617..0304f14 100644 --- a/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java +++ b/pollen-votecounting-normal/src/main/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategy.java @@ -32,10 +32,10 @@ import java.util.Set; /** * Vote counting strategy for {@link NormalVoteCounting}. - * <p/> + * * This is a very basic vote counting: * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NormalVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java index 5e806bb..78768a4 100644 --- a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java +++ b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/NormalVoteCountingStrategyTest.java @@ -46,7 +46,7 @@ import java.util.Set; /** * Tests the {@link NormalVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NormalVoteCountingStrategyTest { diff --git a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index f653294..e5cde68 100644 --- a/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-normal/src/test/resources/log4j2.xml b/pollen-votecounting-normal/src/test/resources/log4j2.xml index cc4556f..0c1cdbb 100644 --- a/pollen-votecounting-normal/src/test/resources/log4j2.xml +++ b/pollen-votecounting-normal/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Normal + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java index 5b055e0..d7d1ad9 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCounting.java @@ -32,7 +32,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class NumberVoteCounting extends AbstractVoteCounting<NumberVoteCountingStrategy> { diff --git a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java index b85c860..8c3472b 100644 --- a/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java +++ b/pollen-votecounting-number/src/main/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategy.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Number strategy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NumberVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java index 76a44e1..4b7f426 100644 --- a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java +++ b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/NumberVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link NumberVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class NumberVoteCountingStrategyTest { diff --git a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index d99194a..60358d2 100644 --- a/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-number/src/test/resources/log4j2.xml b/pollen-votecounting-number/src/test/resources/log4j2.xml index cc4556f..7f6fbd6 100644 --- a/pollen-votecounting-number/src/test/resources/log4j2.xml +++ b/pollen-votecounting-number/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Number + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java index 97bb695..98b8180 100644 --- a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java +++ b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCounting.java @@ -33,7 +33,7 @@ import static org.nuiton.i18n.I18n.n; /** * Coombs vote counting entry point. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.6 */ public class PercentageVoteCounting extends AbstractVoteCounting<PercentageVoteCountingStrategy> { diff --git a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java index bdbe513..a589780 100644 --- a/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java +++ b/pollen-votecounting-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategy.java @@ -33,7 +33,7 @@ import java.util.Set; /** * Percentage strategy. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PercentageVoteCountingStrategy extends AbstractVoteCountingStrategy { diff --git a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java index 8c72574..88f14ab 100644 --- a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java +++ b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageVoteCountingStrategyTest.java @@ -42,7 +42,7 @@ import java.util.Set; /** * Tests the {@link PercentageVoteCountingStrategy}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class PercentageVoteCountingStrategyTest { diff --git a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java index 6743903..fa5a8bc 100644 --- a/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java +++ b/pollen-votecounting-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -28,7 +28,7 @@ import org.junit.Test; /** * Tests the {@link VoteCountingFactory}. * - * @author tchemit <chemit@codelutin.com> + * @author tchemit <chemit@codelutin.com> * @since 1.4.5 */ public class VoteCountingFactoryTest { diff --git a/pollen-votecounting-percentage/src/test/resources/log4j2.xml b/pollen-votecounting-percentage/src/test/resources/log4j2.xml index cc4556f..66c50b1 100644 --- a/pollen-votecounting-percentage/src/test/resources/log4j2.xml +++ b/pollen-votecounting-percentage/src/test/resources/log4j2.xml @@ -1,4 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Percentage + %% + Copyright (C) 2009 - 2015 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% + --> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/pom.xml b/pom.xml index 91471f1..cb989c9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>1.5</version> + <version>3</version> </parent> <groupId>org.chorem</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm