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 033e439 use convention profile name new d9e190a Revert "use convention profile name" new 0ca4199 [iso] use inline variables new 810ea3f [iso] many cleaning on code 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 810ea3fcb29b6b3d53c85b33873f990f9152eb85 Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 11:40:34 2017 +0100 [iso] many cleaning on code commit 0ca419920ef287a9e1ee1cb7b42d5791a95b795d Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 11:02:08 2017 +0100 [iso] use inline variables commit d9e190ae1ab298bfae99a13d054982ef6fa94c3d Author: Tony CHEMIT <dev@tchemit.fr> Date: Tue Jan 3 10:58:48 2017 +0100 Revert "use convention profile name" This reverts commit 033e439c36fe9125856929cea7f6047214b7ac6f. Summary of changes: pollen-persistence/pom.xml | 3 +- .../persistence/PollenTopiaApplicationContext.java | 7 - .../pollen/persistence/entity/ChoiceTopiaDao.java | 9 +- .../pollen/persistence/entity/CommentTopiaDao.java | 4 +- .../persistence/entity/FavoriteListTopiaDao.java | 2 +- .../pollen/persistence/entity/PollTopiaDao.java | 27 ++- .../entity/PollenPrincipalTopiaDao.java | 3 +- .../persistence/entity/PollenPrincipals.java | 2 +- .../persistence/entity/PollenResourceTopiaDao.java | 10 +- .../persistence/entity/PollenUserTopiaDao.java | 3 +- .../chorem/pollen/persistence/entity/Polls.java | 16 +- .../persistence/entity/SessionTokenTopiaDao.java | 3 +- .../pollen/persistence/entity/VoteToChoices.java | 3 +- .../pollen/persistence/entity/VoteTopiaDao.java | 3 +- pollen-persistence/src/main/xmi/pollen.properties | 4 - .../src/test/resources/log4j.properties | 3 - pollen-rest-api/pom.xml | 3 +- .../org/chorem/pollen/rest/api/JsonHelper.java | 176 +++++++------------ .../org/chorem/pollen/rest/api/PollenRender.java | 2 +- .../rest/api/PollenRestApiApplicationContext.java | 25 ++- .../rest/api/PollenRestApiApplicationListener.java | 2 +- .../rest/api/PollenRestApiRequestContext.java | 3 +- .../rest/api/PollenRestApiRequestFilter.java | 17 +- .../rest/api/PollenTopiaTransactionFilter.java | 5 +- .../pollen/rest/api/converter/JsonConverter.java | 11 +- .../org/chorem/pollen/rest/api/v1/AuthApi.java | 3 +- .../org/chorem/pollen/rest/api/v1/ChoiceApi.java | 12 +- .../org/chorem/pollen/rest/api/v1/CommentApi.java | 14 +- .../java/org/chorem/pollen/rest/api/v1/DocApi.java | 3 +- .../org/chorem/pollen/rest/api/v1/ErrorAction.java | 12 +- .../chorem/pollen/rest/api/v1/FavoriteListApi.java | 26 +-- .../org/chorem/pollen/rest/api/v1/PollApi.java | 30 ++-- .../pollen/rest/api/v1/PollenResourceApi.java | 11 +- .../chorem/pollen/rest/api/v1/PollenUserApi.java | 21 +-- .../org/chorem/pollen/rest/api/v1/VoteApi.java | 15 +- .../chorem/pollen/rest/api/v1/VoteCountingApi.java | 6 +- .../pollen/rest/api/v1/VoteCountingTypeApi.java | 4 +- .../chorem/pollen/rest/api/v1/VoterListApi.java | 30 ++-- .../src/main/resources/log4j.properties | 2 - .../pollen/rest/api/AbstractPollenRestApiTest.java | 9 +- .../org/chorem/pollen/rest/api/AuthApiTest.java | 3 +- .../org/chorem/pollen/rest/api/PollApiTest.java | 9 +- .../rest/api/converter/JsonArrayConverterTest.java | 6 +- .../rest/api/converter/JsonConverterTest.java | 12 +- .../src/test/resources/log4j.properties | 3 - pollen-services/pom.xml | 5 +- .../services/DefaultPollenServiceContext.java | 12 +- .../org/chorem/pollen/services/PollenFixtures.java | 7 +- .../pollen/services/TopiaEntityCopyVisitor.java | 13 +- .../chorem/pollen/services/bean/ChoiceBean.java | 4 +- .../services/bean/GroupVoteCountingResultBean.java | 5 +- .../services/bean/PaginationParameterBean.java | 6 +- .../pollen/services/bean/PaginationResultBean.java | 2 +- .../chorem/pollen/services/bean/PollenBeans.java | 10 +- .../pollen/services/bean/PollenEntityId.java | 7 +- .../pollen/services/bean/PollenEntityRef.java | 24 +-- .../pollen/services/bean/PollenUserBean.java | 4 +- .../pollen/services/bean/ResourceFileBean.java | 3 +- .../org/chorem/pollen/services/bean/VoteBean.java | 2 +- .../services/bean/VoteCountingGroupResultBean.java | 2 +- .../pollen/services/bean/VoterListMemberBean.java | 2 +- .../services/config/PollenServiceConfig.java | 58 ++----- .../services/config/PollenServiceConfigOption.java | 6 +- .../pollen/services/service/ChoiceService.java | 60 ++++--- .../pollen/services/service/CommentService.java | 34 ++-- .../chorem/pollen/services/service/ErrorMap.java | 2 +- .../service/FavoriteListImportException.java | 2 +- .../services/service/FavoriteListService.java | 40 ++--- .../pollen/services/service/FixturesService.java | 2 +- .../services/service/NotificationService.java | 13 +- .../pollen/services/service/PollService.java | 83 ++++----- .../services/service/PollenResourceService.java | 21 ++- .../services/service/PollenServiceSupport.java | 98 +++++------ .../services/service/PollenUIUrlRenderService.java | 11 +- .../pollen/services/service/PollenUserService.java | 51 +++--- .../services/service/VoteCountingService.java | 28 ++-- .../services/service/VoteCountingTypeService.java | 9 +- .../pollen/services/service/VoteService.java | 79 +++++---- .../pollen/services/service/VoterListService.java | 65 ++++--- .../pollen/services/service/mail/EmailService.java | 2 +- .../services/service/mail/PollCreatedEmail.java | 9 +- .../pollen/services/service/mail/PollenMail.java | 7 +- .../service/mail/UserAccountCreatedEmail.java | 12 +- .../service/security/PollenSecurityRealm.java | 10 +- .../services/service/security/SecurityService.java | 54 +++--- .../test/FakePollenApplicationContext.java | 12 +- .../services/service/FavoriteListServiceTest.java | 6 +- .../pollen/services/service/PollServiceTest.java | 2 +- .../service/PollenUIUrlRenderServiceTest.java | 10 +- .../services/service/PollenUserServiceTest.java | 4 +- .../services/service/VoteCountingServiceTest.java | 2 +- .../services/service/VoterListServiceTest.java | 11 +- .../src/test/resources/log4j.properties | 3 - pollen-ui-angular/pom.xml | 4 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 2 +- .../src/main/webapp/js/controllers/pollCtrl.js | 6 +- pollen-ui-angular/src/main/webapp/less/style.less | 2 +- .../src/main/webapp/less/variables.less | 2 +- pollen-ui-js/src/main/webapp/js/pollen-utils.js | 2 +- pollen-ui-js/src/main/webapp/js/route.js | 2 +- pollen-votecounting-aggregator/pom.xml | 3 +- pollen-votecounting-api/pom.xml | 3 +- .../pollen/votecounting/AbstractVoteCounting.java | 10 +- .../votecounting/AbstractVoteCountingStrategy.java | 41 ++--- .../chorem/pollen/votecounting/VoteCounting.java | 8 +- .../pollen/votecounting/VoteCountingFactory.java | 10 +- .../pollen/votecounting/model/ChoiceIdAble.java | 2 +- .../pollen/votecounting/model/ChoiceScore.java | 19 +-- .../votecounting/model/GroupOfVoterBuilder.java | 2 +- .../model/GroupVoteCountingResult.java | 11 +- .../votecounting/model/SimpleVoterBuilder.java | 2 +- .../votecounting/model/VoteCountingResult.java | 2 +- .../pollen/votecounting/model/VoterBuilder.java | 8 +- pollen-votecounting-borda/pom.xml | 3 +- .../pollen/votecounting/BordaVoteCounting.java | 2 +- .../votecounting/BordaVoteCountingStrategy.java | 3 +- .../BordaVoteCountingStrategyTest.java | 174 +++++++++---------- pollen-votecounting-condorcet/pom.xml | 3 +- .../pollen/votecounting/CondorcetVoteCounting.java | 2 +- .../CondorcetVoteCountingStrategy.java | 3 +- .../CondorcetVoteCountingStrategyTest.java | 158 ++++++++--------- pollen-votecounting-coombs/pom.xml | 3 +- .../pollen/votecounting/CoombsVoteCounting.java | 4 +- .../votecounting/CoombsVoteCountingStrategy.java | 5 +- .../CoombsVoteCountingStrategyTest.java | 174 +++++++++---------- pollen-votecounting-instant-runoff/pom.xml | 3 +- .../votecounting/InstantRunoffVoteCounting.java | 4 +- .../InstantRunoffVoteCountingStrategy.java | 7 +- .../InstantRunoffVoteCountingStrategyTest.java | 174 +++++++++---------- pollen-votecounting-normal/pom.xml | 3 +- .../votecounting/NormalVoteCountingStrategy.java | 3 +- .../NormalVoteCountingStrategyTest.java | 186 ++++++++++----------- pollen-votecounting-number/pom.xml | 3 +- .../votecounting/NumberVoteCountingStrategy.java | 3 +- .../NumberVoteCountingStrategyTest.java | 132 +++++++-------- pollen-votecounting-percentage/pom.xml | 3 +- .../PercentageVoteCountingStrategy.java | 3 +- .../PercentageVoteCountingStrategyTest.java | 132 +++++++-------- 138 files changed, 1280 insertions(+), 1542 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.