[Pollen-commits] branch develop updated (d8ea8f2 -> c96c02f)

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from d8ea8f2 Happy new year commit new 1e45268 update my email adress new 4096c8a Update librairies version new c96c02f fix my email adress and add myself in Copyright The 3 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 c96c02f3d802374d98626988671d02152bcdb092 Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 09:11:46 2017 +0100 fix my email adress and add myself in Copyright commit 4096c8a719408ec9f8e389fd026056de35d049f9 Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 09:01:01 2017 +0100 Update librairies version commit 1e4526845c90b7e0b20717a8bf4b77b921d490b4 Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 08:21:01 2017 +0100 update my email adress Summary of changes: pollen-persistence/pom.xml | 2 +- .../persistence/PollenPersistenceContext.java | 2 +- .../persistence/PollenTopiaApplicationContext.java | 7 +-- .../persistence/PollenTopiaPersistenceContext.java | 17 ++---- .../pollen/persistence/entity/ChoiceTopiaDao.java | 2 +- .../pollen/persistence/entity/CommentTopiaDao.java | 2 +- .../persistence/entity/FavoriteListTopiaDao.java | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 4 +- .../entity/PollenPrincipalTopiaDao.java | 2 +- .../persistence/entity/PollenPrincipals.java | 2 +- .../persistence/entity/PollenResourceTopiaDao.java | 2 +- .../persistence/entity/PollenUserTopiaDao.java | 4 +- .../pollen/persistence/entity/PollenUsers.java | 2 +- .../chorem/pollen/persistence/entity/Polls.java | 4 +- .../persistence/entity/SessionTokenTopiaDao.java | 2 +- .../pollen/persistence/entity/VoteToChoices.java | 2 +- .../pollen/persistence/entity/VoteTopiaDao.java | 2 +- .../persistence/entity/VoterListTopiaDao.java | 2 +- pollen-persistence/src/main/xmi/pollen.properties | 2 +- .../src/test/resources/db.properties | 2 +- .../src/test/resources/log4j.properties | 2 +- pollen-rest-api/pom.xml | 4 +- pollen-rest-api/src/it/pom/pom.xml | 2 +- pollen-rest-api/src/jetty/jetty-context.xml | 2 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 2 +- .../org/chorem/pollen/rest/api/PollenRender.java | 4 +- .../rest/api/PollenRestApiApplicationContext.java | 4 +- .../rest/api/PollenRestApiApplicationListener.java | 4 +- .../rest/api/PollenRestApiRequestContext.java | 2 +- .../rest/api/PollenRestApiRequestFilter.java | 4 +- .../chorem/pollen/rest/api/PollenRestApiUtil.java | 2 +- .../rest/api/PollenTopiaTransactionFilter.java | 2 +- .../pollen/rest/api/converter/DateConverter.java | 2 +- .../rest/api/converter/JsonArrayConverter.java | 2 +- .../pollen/rest/api/converter/JsonConverter.java | 2 +- .../rest/api/injector/PollenBeanIdInjector.java | 4 +- .../PollenRestApiRequestContextInjector.java | 2 +- .../rest/api/injector/PollenServiceInjector.java | 2 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 4 +- .../java/org/chorem/pollen/rest/api/v1/DocApi.java | 2 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 4 +- .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/PollApi.java | 4 +- .../pollen/rest/api/v1/PollenResourceApi.java | 2 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 4 +- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 4 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 4 +- .../pollen/rest/api/v1/VoteCountingTypeApi.java | 2 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 4 +- .../src/main/resources/log4j.properties | 2 +- .../src/main/resources/pollen-rest-api.properties | 4 +- pollen-rest-api/src/main/webapp/WEB-INF/web.xml | 2 +- .../pollen/rest/api/AbstractPollenRestApiTest.java | 4 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 2 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 2 +- .../chorem/pollen/rest/api/PollenUserApiTest.java | 4 +- .../rest/api/converter/JsonArrayConverterTest.java | 2 +- .../rest/api/converter/JsonConverterTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- pollen-services/pom.xml | 2 +- .../services/DefaultPollenServiceContext.java | 2 +- .../pollen/services/PollenApplicationContext.java | 2 +- .../org/chorem/pollen/services/PollenFixtures.java | 2 +- .../org/chorem/pollen/services/PollenService.java | 4 +- .../pollen/services/PollenServiceContext.java | 4 +- .../pollen/services/PollenTechnicalException.java | 2 +- .../pollen/services/TopiaEntityCopyVisitor.java | 2 +- .../chorem/pollen/services/bean/ChoiceBean.java | 2 +- .../pollen/services/bean/ChoiceScoreBean.java | 2 +- .../chorem/pollen/services/bean/CommentBean.java | 2 +- .../pollen/services/bean/FavoriteListBean.java | 2 +- .../services/bean/FavoriteListMemberBean.java | 2 +- .../services/bean/GroupVoteCountingResultBean.java | 2 +- .../services/bean/PaginationParameterBean.java | 2 +- .../pollen/services/bean/PaginationResultBean.java | 2 +- .../org/chorem/pollen/services/bean/PollBean.java | 2 +- .../chorem/pollen/services/bean/PollenBean.java | 2 +- .../chorem/pollen/services/bean/PollenBeans.java | 2 +- .../pollen/services/bean/PollenEntityId.java | 2 +- .../pollen/services/bean/PollenEntityRef.java | 2 +- .../pollen/services/bean/PollenUserBean.java | 2 +- .../pollen/services/bean/ResourceFileBean.java | 2 +- .../pollen/services/bean/ResourceMetaBean.java | 2 +- .../pollen/services/bean/ResourceStreamBean.java | 2 +- .../org/chorem/pollen/services/bean/VoteBean.java | 2 +- .../services/bean/VoteCountingGroupResultBean.java | 2 +- .../services/bean/VoteCountingResultBean.java | 2 +- .../pollen/services/bean/VoteCountingTypeBean.java | 2 +- .../pollen/services/bean/VoteToChoiceBean.java | 2 +- .../chorem/pollen/services/bean/VoterListBean.java | 2 +- .../pollen/services/bean/VoterListMemberBean.java | 2 +- .../chorem/pollen/services/bean/package-info.java | 4 +- .../services/config/PollenServiceConfig.java | 4 +- .../services/config/PollenServiceConfigOption.java | 4 +- .../pollen/services/config/package-info.java | 4 +- .../org/chorem/pollen/services/package-info.java | 4 +- .../pollen/services/service/ChoiceService.java | 4 +- .../pollen/services/service/CommentService.java | 4 +- .../chorem/pollen/services/service/ErrorMap.java | 2 +- .../services/service/FavoriteListImport.java | 2 +- .../service/FavoriteListImportException.java | 4 +- .../service/FavoriteListImportFromFile.java | 2 +- .../service/FavoriteListImportFromLdap.java | 2 +- .../services/service/FavoriteListService.java | 9 +++- .../pollen/services/service/FixturesService.java | 2 +- .../service/InvalidEntityLinkException.java | 2 +- .../services/service/InvalidFormException.java | 4 +- .../services/service/NotificationService.java | 2 +- .../pollen/services/service/PollService.java | 4 +- .../services/service/PollenResourceService.java | 2 +- .../services/service/PollenServiceSupport.java | 4 +- .../services/service/PollenUIUrlRenderService.java | 2 +- .../pollen/services/service/PollenUserService.java | 14 ++++- .../services/service/VoteCountingService.java | 4 +- .../services/service/VoteCountingTypeService.java | 2 +- .../pollen/services/service/VoteService.java | 4 +- .../pollen/services/service/VoterListService.java | 4 +- .../services/service/mail/ChoiceAddedEmail.java | 2 +- .../services/service/mail/ChoiceDeletedEmail.java | 2 +- .../services/service/mail/ChoiceEditedEmail.java | 2 +- .../services/service/mail/CommentAddedEmail.java | 2 +- .../services/service/mail/CommentDeletedEmail.java | 2 +- .../services/service/mail/CommentEditedEmail.java | 2 +- .../pollen/services/service/mail/EmailService.java | 2 +- .../services/service/mail/LostPasswordEmail.java | 2 +- .../service/mail/PollChoicePeriodEndedEmail.java | 2 +- .../service/mail/PollChoicePeriodStartedEmail.java | 2 +- .../services/service/mail/PollClosedEmail.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 2 +- .../service/mail/PollVotePeriodEndedEmail.java | 2 +- .../service/mail/PollVotePeriodStartedEmail.java | 2 +- .../service/mail/PollVoteReminderEmail.java | 2 +- .../pollen/services/service/mail/PollenMail.java | 2 +- .../mail/RestrictedPollInvitationEmail.java | 2 +- .../service/mail/UserAccountCreatedEmail.java | 2 +- .../services/service/mail/VoteAddedEmail.java | 2 +- .../services/service/mail/VoteDeletedEmail.java | 2 +- .../services/service/mail/VoteEditedEmail.java | 2 +- .../pollen/services/service/package-info.java | 4 +- .../security/DefaultPollenSecurityContext.java | 4 +- .../services/service/security/PermissionVerb.java | 4 +- .../security/PollenAuthenticationException.java | 2 +- ...PollenInvalidEmailActivationTokenException.java | 4 +- .../security/PollenInvalidPasswordException.java | 4 +- .../security/PollenInvalidPermissionException.java | 2 +- .../PollenInvalidSessionTokenException.java | 4 +- .../service/security/PollenSecurityContext.java | 2 +- .../service/security/PollenSecurityRealm.java | 4 +- .../security/PollenUnauthorizedException.java | 2 +- .../services/service/security/SecurityService.java | 4 +- .../test/FakePollenApplicationContext.java | 27 ++++++++-- .../services/test/FakePollenSecurityContext.java | 2 +- .../services/test/FakePollenServiceContext.java | 2 +- .../pollen/services/AbstractPollenServiceTest.java | 2 +- .../services/service/FavoriteListServiceTest.java | 2 +- .../pollen/services/service/PollServiceTest.java | 4 +- .../service/PollenUIUrlRenderServiceTest.java | 2 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 2 +- .../pollen/services/service/VoteServiceTest.java | 2 +- .../services/service/VoterListServiceTest.java | 2 +- .../src/test/resources/log4j.properties | 2 +- .../src/test/resources/pollen-services.properties | 4 +- pollen-ui-angular/pom.xml | 2 +- pollen-ui-angular/src/main/webapp/WEB-INF/web.xml | 2 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 +- pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 +- pollen-ui-angular/src/main/webapp/index.html | 2 +- pollen-ui-angular/src/main/webapp/js/app.js | 2 +- .../src/main/webapp/js/controllers/alertCtrl.js | 2 +- .../main/webapp/js/controllers/favoriteListCtrl.js | 2 +- .../src/main/webapp/js/controllers/localeCtrl.js | 2 +- .../src/main/webapp/js/controllers/mainCtrl.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 2 +- .../src/main/webapp/js/controllers/userCtrl.js | 2 +- pollen-ui-angular/src/main/webapp/js/directives.js | 2 +- .../src/main/webapp/js/libs/ckeditor/config.js | 2 +- .../main/webapp/js/scripts/sticky-inline-poll.js | 2 +- pollen-ui-angular/src/main/webapp/js/services.js | 2 +- .../src/main/webapp/partials/alerts.html | 2 +- .../src/main/webapp/partials/big-poll.html | 2 +- .../src/main/webapp/partials/dateTimePicker.html | 2 +- .../main/webapp/partials/favoriteList-edit.html | 2 +- .../main/webapp/partials/favoriteList-list.html | 2 +- .../src/main/webapp/partials/home.html | 2 +- .../src/main/webapp/partials/inline-poll.html | 2 +- .../src/main/webapp/partials/pagination.html | 2 +- .../src/main/webapp/partials/poll-comment.html | 2 +- .../src/main/webapp/partials/poll-info.html | 2 +- .../src/main/webapp/partials/poll-link.html | 2 +- .../src/main/webapp/partials/poll-list.html | 2 +- .../main/webapp/partials/poll-listParticipant.html | 2 +- .../src/main/webapp/partials/poll-poll.html | 2 +- .../src/main/webapp/partials/poll-popupChoice.html | 2 +- .../src/main/webapp/partials/poll-result.html | 2 +- .../src/main/webapp/partials/poll-settings.html | 2 +- .../src/main/webapp/partials/poll.html | 2 +- .../src/main/webapp/partials/printResource.html | 2 +- .../src/main/webapp/partials/user-admin-list.html | 2 +- .../webapp/partials/user-edit-editProfile.html | 2 +- .../main/webapp/partials/user-edit-password.html | 2 +- .../webapp/partials/user-edit-viewProfile.html | 2 +- .../src/main/webapp/partials/user-edit.html | 2 +- .../src/main/webapp/partials/user-login.html | 2 +- .../main/webapp/partials/user-lostPassword.html | 2 +- .../src/main/webapp/partials/user-register.html | 2 +- pollen-ui-angular/src/test/karma.conf.ci.js | 2 +- pollen-ui-angular/src/test/karma.conf.js | 2 +- .../src/test/unit/alertControllersTest.js | 2 +- .../src/test/unit/pollControllersTest.js | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- .../pollen/votecounting/AbstractVoteCounting.java | 4 +- .../votecounting/AbstractVoteCountingStrategy.java | 4 +- .../chorem/pollen/votecounting/VoteCounting.java | 4 +- .../pollen/votecounting/VoteCountingFactory.java | 4 +- .../pollen/votecounting/VoteCountingNotFound.java | 4 +- .../pollen/votecounting/VoteCountingStrategy.java | 4 +- .../pollen/votecounting/model/ChoiceIdAble.java | 4 +- .../pollen/votecounting/model/ChoiceScore.java | 4 +- .../votecounting/model/ChoiceToVoteRenderType.java | 4 +- .../pollen/votecounting/model/GroupOfVoter.java | 4 +- .../votecounting/model/GroupOfVoterBuilder.java | 4 +- .../model/GroupVoteCountingResult.java | 4 +- .../pollen/votecounting/model/SimpleVoter.java | 4 +- .../votecounting/model/SimpleVoterBuilder.java | 4 +- .../votecounting/model/VoteCountingResult.java | 4 +- .../pollen/votecounting/model/VoteForChoice.java | 4 +- .../chorem/pollen/votecounting/model/Voter.java | 4 +- .../pollen/votecounting/model/VoterBuilder.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-borda/pom.xml | 2 +- .../pollen/votecounting/BordaVoteCounting.java | 4 +- .../votecounting/BordaVoteCountingStrategy.java | 4 +- .../BordaVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- .../pollen/votecounting/CondorcetVoteCounting.java | 4 +- .../CondorcetVoteCountingStrategy.java | 4 +- .../CondorcetVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- .../pollen/votecounting/CoombsVoteCounting.java | 4 +- .../votecounting/CoombsVoteCountingStrategy.java | 4 +- .../CoombsVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- .../votecounting/InstantRunoffVoteCounting.java | 4 +- .../InstantRunoffVoteCountingStrategy.java | 4 +- .../InstantRunoffVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-normal/pom.xml | 2 +- .../pollen/votecounting/NormalVoteCounting.java | 4 +- .../votecounting/NormalVoteCountingStrategy.java | 4 +- .../NormalVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-number/pom.xml | 2 +- .../pollen/votecounting/NumberVoteCounting.java | 4 +- .../votecounting/NumberVoteCountingStrategy.java | 4 +- .../NumberVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- .../votecounting/PercentageVoteCounting.java | 4 +- .../PercentageVoteCountingStrategy.java | 4 +- .../PercentageVoteCountingStrategyTest.java | 4 +- .../votecounting/VoteCountingFactoryTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pom.xml | 60 +++++++++++----------- src/site/fr/rst/configure.rst | 2 +- src/site/fr/rst/depouillement.rst | 2 +- src/site/fr/rst/index.rst | 2 +- src/site/rst/configure.rst | 2 +- src/site/rst/index.rst | 2 +- src/site/rst/methods.rst | 2 +- src/site/rst/restApi.rst | 2 +- src/site/rst/security.rst | 2 +- src/site/rst/service.rst | 2 +- src/site/rst/tests.rst | 2 +- src/site/site_en.xml | 2 +- src/site/site_fr.xml | 2 +- 289 files changed, 458 insertions(+), 434 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.