Author: tchemit Date: 2012-01-30 21:43:30 +0100 (Mon, 30 Jan 2012) New Revision: 3122 Url: http://chorem.org/repositories/revision/pollen/3122 Log: - svn properties - migrate some entities to enum (choiceType, PollType and VoteCountingType) - make user admin works with version 1.2.6 Added: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_en_GB.properties branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_fr_FR.properties Modified: branches/pollen-1.2.6-struts2/README.txt branches/pollen-1.2.6-struts2/changelog.txt branches/pollen-1.2.6-struts2/doc/Analyse.odt branches/pollen-1.2.6-struts2/doc/Architecture.odt branches/pollen-1.2.6-struts2/doc/Conception.odt branches/pollen-1.2.6-struts2/doc/Gestion projet.odt branches/pollen-1.2.6-struts2/doc/Infrastructure.odt branches/pollen-1.2.6-struts2/doc/images/CasUtilisations.png branches/pollen-1.2.6-struts2/doc/images/Modele_Domaine.png branches/pollen-1.2.6-struts2/doc/images/UIOs.png branches/pollen-1.2.6-struts2/doc/images/apache.png branches/pollen-1.2.6-struts2/doc/images/dateTimeField.png branches/pollen-1.2.6-struts2/doc/images/exMyPolls.png branches/pollen-1.2.6-struts2/doc/images/exVote.png branches/pollen-1.2.6-struts2/doc/images/firefox.png branches/pollen-1.2.6-struts2/doc/images/pollen.jpg branches/pollen-1.2.6-struts2/doc/images/pollen_logo.jpg branches/pollen-1.2.6-struts2/doc/images/schema-architecture.png branches/pollen-1.2.6-struts2/doc/images/t5Components.png branches/pollen-1.2.6-struts2/doc/images/tapestry.png branches/pollen-1.2.6-struts2/doc/images/topCount.png branches/pollen-1.2.6-struts2/doc/images/topCreation.png branches/pollen-1.2.6-struts2/doc/images/topIndex.png branches/pollen-1.2.6-struts2/doc/images/topVote.png branches/pollen-1.2.6-struts2/doc/pollen-slides.odp branches/pollen-1.2.6-struts2/doc/rapportRannou.odt branches/pollen-1.2.6-struts2/pollen-business/README.txt branches/pollen-1.2.6-struts2/pollen-business/pom.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.zargo branches/pollen-1.2.6-struts2/pollen-persistence/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-persistence/README.txt branches/pollen-1.2.6-struts2/pollen-persistence/changelog.txt branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml branches/pollen-1.2.6-struts2/pollen-persistence/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-services/README.txt branches/pollen-1.2.6-struts2/pollen-services/changelog.txt branches/pollen-1.2.6-struts2/pollen-services/pom.xml branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/README.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/changelog.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/favicon.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1downarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1uparrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/7ter.jpg branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/close.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/contact.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/copy.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/count.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/delete.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/edit.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/editSmall.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/exclamation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/export.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed2.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/gplv3.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/help.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/import.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/lutin.gif branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep1.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep2.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep3.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/save.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menu.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/true.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/undo.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/vote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js branches/pollen-1.2.6-struts2/pollen-ui/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-ui/README.txt branches/pollen-1.2.6-struts2/pollen-ui/changelog.txt branches/pollen-1.2.6-struts2/pollen-ui/doc/UIOs.zargo branches/pollen-1.2.6-struts2/pollen-ui/pom.xml branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/PollenBaseAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePollAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/PollsParticipatedAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/LoginUserAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUserAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/UserProfileAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/base/Polls.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/base/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedBack.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ImageContextLink.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/LoginComponent.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/EvenOdd.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/GenericSelectModel.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/Lien.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollAction.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollHelper.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollStep.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/uio/DateChoiceUIO.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/uio/ImageChoiceUIO.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/PollenExceptionsFilter.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Index.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/LocalMessages.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/PollsAdmin.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CloseValidation.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CreationValidation.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ImageDisplay.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ModificationValidation.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Account.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserLists.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsCreated.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsParticipated.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorker.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ConfigurationImpl.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenShutdown.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PropertiesFileSymbolProvider.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVAccountUtil.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVParseException.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/FeedUtil.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/ImageUtil.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/LDAPAccountUtil.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/PasswordGenerator.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/UnitConverter.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/package-info.java branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Image.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/LoginComponent.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/LoginComponent_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/LoginComponent_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/PollsAdmin_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/PollsAdmin_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/UsersAdmin_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/UsersAdmin_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Account_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Account_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Register_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Register_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/pollen.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/Index.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/app.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/app_en.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/main.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/web.xml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/admin/PollsAdmin.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/admin/UsersAdmin.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/account.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/grid.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/lightbox.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/lists.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/loginComponent.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/main.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollCreation.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollsAdmin.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollsCreated.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollsParticipated.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/register.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/results.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/usersAdmin.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/vote.css branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/favicon.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/7ter.jpg branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/bigCreation.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/bigVote.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/bigVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/close.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/contact.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/copy.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/count.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/delete.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/edit.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/editSmall.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/export.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/feed.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/feed2.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/gplv3.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/help.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/import.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/closelabel.gif branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/loading.gif branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/nextlabel.gif branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/prevlabel.gif branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lutin.gif branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollen.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenCreation_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenCreation_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenIndex_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenIndex_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVoteCounting_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVoteCounting_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVote_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVote_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollen_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollen_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/rep1.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/rep2.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/rep3.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallCreation.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallCreation_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallCreation_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVote.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVoteCounting_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVoteCounting_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVote_en.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVote_fr.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menu.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuCreation.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuIndex.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuVote.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menu.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuCreation.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuIndex.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuVote.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/vote.png branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/js/lightbox.js branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/js/pollen.js branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/polls.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/users.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/index.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/closeValidation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/confirmPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/creationValidation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/imageDisplay.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/modificationValidation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollCreation.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollForm.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollLinks.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollModification.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/results.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/voteForPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/lists.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsCreated.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsParticipated.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/profile.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/register.jsp branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/CloseValidation.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/ConfirmPoll.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/CreationValidation.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/ImageDisplay.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/ModificationValidation.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/PollCreation.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/PollModification.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/Results.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/VoteForPoll.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit-close.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/Account.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/Register.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/UserLists.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/UserPollsCreated.tml branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/UserPollsParticipated.tml branches/pollen-1.2.6-struts2/pollen-ui/src/test/java/org/chorem/pollen/ui/PropertiesLoaderTest.java branches/pollen-1.2.6-struts2/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/CSVAccountUtilTest.java branches/pollen-1.2.6-struts2/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java branches/pollen-1.2.6-struts2/pollen-ui/src/test/resources/import.csv branches/pollen-1.2.6-struts2/pollen-votecounting/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-votecounting/README.txt branches/pollen-1.2.6-struts2/pollen-votecounting/changelog.txt branches/pollen-1.2.6-struts2/pollen-votecounting/doc/exportXML.zargo branches/pollen-1.2.6-struts2/pollen-votecounting/doc/votecountingapi.zargo branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java branches/pollen-1.2.6-struts2/pom.xml branches/pollen-1.2.6-struts2/src/site/fr/resources/pollen.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/CreerSondage.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/CreerSondage2.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/DC_Pollen.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/DC_PreventRules.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/DET_PollState.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/Depouiller.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/Depouiller_1a.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/UC_Gestiondesvotes.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/Voter.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_BusinessDTOs.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_DBUtil.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServicePoll.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServiceResults.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServiceUser.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServiceVote.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DS_Conception_CreerSondage.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/composants.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/packages.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/pollen_logo.jpg branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/schema-architecture.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/DC_UIOs.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/chart.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/dateTimeField.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/feedBack.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topCount.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topCreation.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topIndex.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topVote.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceExport.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceExportImpl.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceExportXML.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceVoteCounting.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceVoteCountingImpl.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_VoteCountingDTOs.png branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/Seq-executeVoteCounting.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-1.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-2.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-3.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-4.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-5.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-6.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-links.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step1.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step2.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step3.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step4.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Results.png branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Vote.png branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/assentiment.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/condorcet.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/depouillement.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/developer.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/historique.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/index.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/nombre.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/pourcentage.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/user.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst branches/pollen-1.2.6-struts2/src/site/resources/pollen.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/CreerSondage.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/CreerSondage2.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/DC_Pollen.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/DC_PreventRules.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/DET_PollState.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/Depouiller.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/Depouiller_1a.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/UC_Gestiondesvotes.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/Voter.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_BusinessDTOs.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_DBUtil.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServicePoll.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServiceResults.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServiceUser.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServiceVote.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DS_Conception_CreerSondage.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/composants.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/packages.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/pollen_logo.jpg branches/pollen-1.2.6-struts2/src/site/resources/schemas/schema-architecture.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/DC_UIOs.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/chart.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/dateTimeField.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/feedBack.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topCount.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topCreation.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topIndex.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topVote.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceExport.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceExportImpl.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceExportXML.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceVoteCounting.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceVoteCountingImpl.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_VoteCountingDTOs.png branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/Seq-executeVoteCounting.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-1.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-2.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-3.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-4.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-5.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-6.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-links.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step1.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step2.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step3.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step4.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Results.png branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Vote.png branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst branches/pollen-1.2.6-struts2/src/site/rst/approval.rst branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst branches/pollen-1.2.6-struts2/src/site/rst/business.rst branches/pollen-1.2.6-struts2/src/site/rst/condorcet.rst branches/pollen-1.2.6-struts2/src/site/rst/developer.rst branches/pollen-1.2.6-struts2/src/site/rst/historical.rst branches/pollen-1.2.6-struts2/src/site/rst/index.rst branches/pollen-1.2.6-struts2/src/site/rst/install.rst branches/pollen-1.2.6-struts2/src/site/rst/methods.rst branches/pollen-1.2.6-struts2/src/site/rst/number.rst branches/pollen-1.2.6-struts2/src/site/rst/percentage.rst branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst branches/pollen-1.2.6-struts2/src/site/rst/ui.rst branches/pollen-1.2.6-struts2/src/site/rst/user.rst branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst branches/pollen-1.2.6-struts2/src/site/site_en.xml branches/pollen-1.2.6-struts2/src/site/site_fr.xml branches/pollen-1.2.6-struts2/todo.txt Property changes on: branches/pollen-1.2.6-struts2/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/doc/Analyse.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/Architecture.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/Conception.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/Gestion projet.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/Infrastructure.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/CasUtilisations.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/Modele_Domaine.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/UIOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/apache.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/dateTimeField.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/exMyPolls.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/exVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/firefox.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/pollen.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/pollen_logo.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/schema-architecture.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/t5Components.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/tapestry.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/topCount.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/topCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/topIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/images/topVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/pollen-slides.odp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/doc/rapportRannou.odt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-business/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ * #%L * Pollen :: Persistence * - * $Id: PollenConfiguration.java 3097 2012-01-20 16:48:46Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persisten... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -27,6 +27,9 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; @@ -34,7 +37,6 @@ import java.io.File; import java.io.IOException; -import java.util.List; import java.util.Properties; /** @@ -81,22 +83,25 @@ } } - public List<String> getDefaultChoiceTypes() { - ApplicationConfig.OptionList result = applicationConfig.getOptionAsList( - PollenConfigurationOption.DEFAULT_CHOICE_TYPES.key); - return result.getOption(); + public ChoiceType getDefaultChoiceType() { + ChoiceType result = applicationConfig.getOptionAsObject( + ChoiceType.class, + PollenConfigurationOption.DEFAULT_CHOICE_TYPE.key); + return result; } - public List<String> getDefaultVoteCountings() { - ApplicationConfig.OptionList result = applicationConfig.getOptionAsList( - PollenConfigurationOption.DEFAULT_VOTE_COUNTINGS.key); - return result.getOption(); + public VoteCountingType getDefaultVoteCountingType() { + VoteCountingType result = applicationConfig.getOptionAsObject( + VoteCountingType.class, + PollenConfigurationOption.DEFAULT_VOTE_COUNTING_TYPE.key); + return result; } - public List<String> getDefaultPollTypes() { - ApplicationConfig.OptionList result = applicationConfig.getOptionAsList( - PollenConfigurationOption.DEFAULT_POLL_TYPES.key); - return result.getOption(); + public PollType getDefaultPollType() { + PollType result = applicationConfig.getOptionAsObject( + PollType.class, + PollenConfigurationOption.DEFAULT_POLL_TYPE.key); + return result; } public String getAdminLogin() { @@ -270,8 +275,8 @@ Preconditions.checkNotNull( directory, "Could not find directory " + directory + " (key " + - key + - "in your configuration file named echobase.properties)" + key + + "in your configuration file named echobase.properties)" ); if (log.isInfoEnabled()) { log.info(key + " = " + directory); Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ * #%L * Pollen :: Persistence * - * $Id: PollenConfigurationOption.java 3097 2012-01-20 16:48:46Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persisten... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -23,11 +23,13 @@ */ package org.chorem.pollen; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.Version; import java.io.File; -import java.util.List; /** * All EchoBase configuration options. @@ -64,12 +66,12 @@ /** Charset of Pollen. */ CHARSET("pollen.charset", "Charset of Pollen", "UTF-8", String.class), - /** Default poll types to create on empty db. */ - DEFAULT_POLL_TYPES("pollen.pollTypes", "Default poll types to create on empty db", "RESTRICTED,FREE,GROUP", List.class), - /** Default vote countings to create on empty db. */ - DEFAULT_VOTE_COUNTINGS("pollen.voteCountings", "Default vote countings to create on empty db", "NORMAL,PERCENTAGE,CONDORCET,NUMBER", List.class), - /** Default choice types to create on empty db. */ - DEFAULT_CHOICE_TYPES("pollen.voteCountings", "Default choice types to create on empty db", "DATE,IMAGE,TEXT", List.class), + /** Default poll type to use at a new poll creation. */ + DEFAULT_POLL_TYPE("pollen.default.pollType", "Default poll type to use at a new poll creation", PollType.FREE.name(), PollType.class), + /** Default vote counting type to use at a new poll creation. */ + DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", "Default vote counting type to use at a new poll creation", VoteCountingType.NORMAL.name(), VoteCountingType.class), + /** Default choice type to use at a new poll creation. */ + DEFAULT_CHOICE_TYPE("pollen.default.choiceType", "Default choice type to use at a new poll creation", ChoiceType.TEXT.name(), ChoiceType.class), /** Pollen version. */ VERSION("pollen.version", "Version de l'application", "", Version.class); Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ * #%L * Pollen :: Persistence * - * $Id: PollenFunctions.java 3101 2012-01-23 10:32:33Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persisten... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ * #%L * Pollen :: Persistence * - * $Id: PollenTechnicalException.java 3097 2012-01-20 16:48:46Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persisten... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ * #%L * Pollen :: Persistence * - * $Id: PollenTopiaRootContextFactory.java 3108 2012-01-23 22:27:46Z tchemit $ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persisten... $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -23,11 +23,24 @@ */ package org.chorem.pollen.entities.migration; +import com.google.common.base.Function; +import com.google.common.collect.Maps; +import org.apache.commons.lang3.tuple.Pair; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLQuery; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.List; +import java.util.Map; /** * Migration for version {@code 1.2.6}. @@ -47,7 +60,6 @@ boolean showSql, boolean showProgression) throws TopiaException { - // Dialect dialect = // Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); // @@ -59,6 +71,165 @@ // let's use a primitive boolean queries.add("update useraccount set administrator = false where administrator is null;"); + // change choice type to use enumeration + migrateChoiceTypes(tx, queries); + // change poll type to use enumeration + migratePollTypes(tx, queries); + + // change vote counting type to use enumeration + migrateVoteCountingTypes(tx, queries); } + + + private void migrateChoiceTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old choice type id associated to new choicetype enum ordinal + Map<String, Integer> mapping = getMapping(tx, "choicetype", ChoiceType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf5b0b3601", + "choicetype", + "choicetype", + mapping, + queries); + + // drop choicetype table + queries.add("DROP TABLE choicetype;"); + } + + private void migratePollTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old choice type id associated to new choicetype enum ordinal + Map<String, Integer> mapping = getMapping(tx, "polltype", PollType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf978bfd", + "polltype", + "polltype", + mapping, + queries); + + // drop pollType table + queries.add("DROP TABLE polltype;"); + } + + private void migrateVoteCountingTypes(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + // build the new mapping between old id associated to new enum ordinal + Map<String, Integer> mapping = getMapping(tx, "votecounting", VoteCountingType.values()); + + replaceColumn(tx, + "poll", + "fk3497bf7d358045", + "votecounting", + "votecountingtype", + mapping, + queries); + + replaceColumn(tx, + "result", + "fkc84dc81d7d358045", + "votecounting", + "votecountingtype", + mapping, + queries); + + // drop votecounting table + queries.add("DROP TABLE votecounting;"); + } + + private <E extends Enum<E>> Map<String, Integer> getMapping(TopiaContextImplementor tx, String tableName, E... enums) throws TopiaException { + + List<Pair<String, String>> entitiesFromDb = + new TopiaIdSQLQueryToPair("select topiaId, name from " + tableName).findMultipleResult(tx); + + Map<String, Pair<String, String>> entityByTopiaIdAndName = + Maps.uniqueIndex(entitiesFromDb, PAIR_TO_VALUE); + + // build the new mapping between old id associated to new enum ordinal + Map<String, Integer> result = Maps.newHashMap(); + + for (Enum choiceType : enums) { + + // find it in existing mapping + String name = choiceType.name(); + Pair<String, String> choiceTypePair = entityByTopiaIdAndName.get(name); + if (choiceTypePair == null) { + + // this can not happen + throw new PollenTechnicalException( + "Could not find in db to migrate choicetype with name " + name); + } + + String id = choiceTypePair.getKey(); + result.put(id, choiceType.ordinal()); + } + return result; + } + + private void replaceColumn(TopiaContextImplementor tx, + String tableName, String fk, + String oldColumn, + String newColum, + Map<String, Integer> mapping, + List<String> queries) throws TopiaException { + + List<Pair<String, String>> rowsToReplace = + new TopiaIdSQLQueryToPair("select topiaId, " + oldColumn + " from " + tableName).findMultipleResult(tx); + + queries.add("ALTER TABLE " + tableName + " DROP CONSTRAINT " + fk + ";"); + queries.add("ALTER TABLE " + tableName + " DROP COLUMN " + oldColumn + ";"); + queries.add("ALTER TABLE " + tableName + " ADD COLUMN " + newColum + " INT NOT NULL DEFAULT 0;"); + + String updateRequest = "update " + tableName + " set " + newColum + " = %s where topiaid = '%s';"; + for (Pair<String, String> pollByChoice : rowsToReplace) { + + String tableRowId = pollByChoice.getKey(); + String typeId = pollByChoice.getValue(); + + Integer ordinalValue = mapping.get(typeId); + if (ordinalValue == null) { + + // use a 0 value + ordinalValue = 0; + } + String query = String.format(updateRequest, ordinalValue, tableRowId); + queries.add(query); + } + } + + private static class TopiaIdSQLQueryToPair extends TopiaSQLQuery<Pair<String, String>> { + + protected final String request; + + private TopiaIdSQLQueryToPair(String request) { + this.request = request; + } + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement prepareStatement = connection.prepareStatement(request); + return prepareStatement; + } + + @Override + protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { + Pair<String, String> result = Pair.of(set.getString(1), set.getString(2)); + return result; + } + } + + public static final Function<Pair<String, String>, String> PAIR_TO_VALUE = new Function<Pair<String, String>, String>() { + @Override + public String apply(Pair<String, String> input) { + return input.getValue(); + } + }; + } Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ # #%L # Pollen :: Business # -# $Id: largemaillist.sh 3096 2012-01-19 23:57:08Z tchemit $ -# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persisten... $ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2009 - 2012 CodeLutin # %% Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -25,18 +25,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PollenTechnicalException; -import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.PollAccountImpl; import org.chorem.pollen.business.persistence.PollImpl; -import org.chorem.pollen.business.persistence.PollType; import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.business.persistence.VoteCounting; -import org.chorem.pollen.entities.PollenDAOHelper; import org.chorem.pollen.services.PollenServiceSupport; -import org.nuiton.topia.TopiaException; public class PollService extends PollenServiceSupport { @@ -52,33 +47,27 @@ public Poll getNewPoll(UserAccount user) { Poll result = new PollImpl(); - try { - ChoiceType choiceType = PollenDAOHelper.getChoiceTypeDAO(getTransaction()).findByName("TEXT"); - result.setChoiceType(choiceType); + PollenConfiguration configuration = getConfiguration(); - VoteCounting voteCounting = PollenDAOHelper.getVoteCountingDAO(getTransaction()).findByName("NORMAL"); - result.setVoteCounting(voteCounting); + // default values from configuration + result.setChoiceType(configuration.getDefaultChoiceType()); + result.setVoteCountingType(configuration.getDefaultVoteCountingType()); + result.setPollType(configuration.getDefaultPollType()); - PollType pollType = PollenDAOHelper.getPollTypeDAO(getTransaction()).findByName("FREE"); - result.setPollType(pollType); - - // Initialize creator as an admin for the poll - PollAccount creator = new PollAccountImpl(); + // Initialize creator as an admin for the poll + PollAccount creator = new PollAccountImpl(); // creator.setAdmin(true); - if (user != null) { - // Link the creator with the user + if (user != null) { + // Link the creator with the user // creator.setName(user.getDisplayName()); - creator.setEmail(user.getEmail()); - creator.setUserAccount(user); - } - result.setCreator(creator); - // Generate Uid to have a unique poll. Will avoid multi-submit, existing - // poll will be check by its uid. - result.setPollId(serviceContext.createPollenUrlId()); - return result; - } catch (TopiaException e) { - throw new PollenTechnicalException(e); + creator.setEmail(user.getEmail()); + creator.setUserAccount(user); } + result.setCreator(creator); + // Generate Uid to have a unique poll. Will avoid multi-submit, existing + // poll will be check by its uid. + result.setPollId(serviceContext.createPollenUrlId()); + return result; } // // /** Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: Services * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ # Pollen :: Business # # $Id$ -# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ +# $HeadURL$ # %% # Copyright (C) 2009 - 2010 CodeLutin # %% Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ # Pollen :: Services # # $Id$ -# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services/... $ +# $HeadURL$ # %% # Copyright (C) 2009 - 2012 CodeLutin # %% @@ -29,6 +29,11 @@ hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver +# Migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback +topia.service.migration.showSql=true + upImgDir=${testDirectory}/.pollen/uploadedImages feedDir=${testDirectory}/.pollen/feeds pollen.emails.directory=${testDirectory}/.pollen/emails Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/doc/UIOs.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/PollenSession.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/PollenBaseAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePollAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/poll/PollsParticipatedAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/LoginUserAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUserAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/actions/user/UserProfileAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/base/Polls.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/base/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedBack.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Image.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ImageContextLink.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/LoginComponent.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/components/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/EvenOdd.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/GenericSelectModel.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/Lien.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollAction.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollHelper.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollStep.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/uio/DateChoiceUIO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/data/uio/ImageChoiceUIO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/PollenExceptionsFilter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Index.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/LocalMessages.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/PollsAdmin.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/UsersAdmin.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CloseValidation.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CreationValidation.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ImageDisplay.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ModificationValidation.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollCreation.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Account.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/Register.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserLists.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsCreated.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsParticipated.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorker.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/BackgroundWorkerImpl.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ConfigurationImpl.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenShutdown.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PropertiesFileSymbolProvider.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/services/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVAccountUtil.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVParseException.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/FeedUtil.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/ImageUtil.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/LDAPAccountUtil.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/PasswordGenerator.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/SendMail.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/UnitConverter.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Image.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/LoginComponent.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/LoginComponent_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/LoginComponent_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/PollsAdmin_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/PollsAdmin_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/UsersAdmin_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/UsersAdmin_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Account_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Account_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Register_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/Register_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/pollen.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/Index.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/app.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/app_en.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/app_fr.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/decorators/main.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/admin/PollsAdmin.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/admin/UsersAdmin.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/account.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/grid.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/lightbox.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/lists.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/loginComponent.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/main.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollCreation.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollsAdmin.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollsCreated.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/pollsParticipated.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/register.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/results.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/usersAdmin.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/css/vote.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/favicon.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/7ter.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/bigCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/bigVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/bigVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/close.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/contact.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/copy.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/count.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/delete.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/edit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/editSmall.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/export.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/feed.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/feed2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/gplv3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/help.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/import.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/closelabel.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/loading.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/nextlabel.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lightbox/prevlabel.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/lutin.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenCreation_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenCreation_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenIndex_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenIndex_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVoteCounting_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVoteCounting_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVote_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollenVote_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollen_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/pollen_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/rep1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/rep2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/rep3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallCreation_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallCreation_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVoteCounting_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVoteCounting_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVote_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/smallVote_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menu.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topleft_menuVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menu.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/topright_menuVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/img/vote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/js/lightbox.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/js/pollen.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/polls.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/admin/users.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/index.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/closeValidation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/confirmPoll.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/creationValidation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/imageDisplay.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/modificationValidation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollCreation.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollForm.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollLinks.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/pollModification.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/results.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/poll/voteForPoll.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/lists.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsCreated.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/pollsParticipated.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/profile.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/jsp/user/register.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/CloseValidation.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/ConfirmPoll.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/CreationValidation.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/ImageDisplay.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/ModificationValidation.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/PollCreation.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/PollModification.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/Results.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/poll/VoteForPoll.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: form.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/simple/form-common.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: controlheader-core.ftl 720258 2008-11-24 19:05:16Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/controlheader-core.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: file.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/file.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: form-close.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: form.ftl 720258 2008-11-24 19:05:16Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/form.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: password.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/password.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit-close.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: submit.ftl 720258 2008-11-24 19:05:16Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/submit.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -1,6 +1,6 @@ <#-- /* - * $Id: text.ftl 590812 2007-10-31 20:32:54Z apetrelli $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/template/xhtml/text.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/Account.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/Register.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/UserLists.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/UserPollsCreated.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/main/webapp/user/UserPollsParticipated.tml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/test/java/org/chorem/pollen/ui/PropertiesLoaderTest.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/CSVAccountUtilTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/SendMailTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui/src/test/resources/import.csv ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -23,34 +23,26 @@ */ package org.chorem.pollen.ui; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.PollenTopiaRootContextFactory; -import org.chorem.pollen.business.persistence.ChoiceType; -import org.chorem.pollen.business.persistence.ChoiceTypeDAO; -import org.chorem.pollen.business.persistence.PollType; -import org.chorem.pollen.business.persistence.PollTypeDAO; -import org.chorem.pollen.business.persistence.VoteCounting; -import org.chorem.pollen.business.persistence.VoteCountingDAO; import org.chorem.pollen.entities.PollenDAOHelper; import org.chorem.pollen.services.DefaultPollenServiceContext; import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.PollenServiceFactory; -import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaUtil; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; import java.util.Date; -import java.util.List; import java.util.Locale; /** @@ -100,7 +92,7 @@ rootContext = factory.newDatabaseFromConfig(configuration); applicationContext.setRootContext(rootContext); - // init database (and create minimal admin user if required) + // init db try { initDB(applicationContext); @@ -132,93 +124,49 @@ } protected void initDB(PollenApplicationContext applicationContext) throws TopiaException { + + boolean schemaFound = TopiaUtil.isSchemaExist( + rootContext, + PollenDAOHelper.PollenEntityEnum.UserAccount.getImplementation().getName() + ); + + if (!schemaFound) { + rootContext.updateSchema(); + } + PollenConfiguration configuration = applicationContext.getConfiguration(); PollenServiceFactory serviceFactory = new PollenServiceFactory(); + TopiaContext transaction = rootContext.beginTransaction(); - PollenServiceContext serviceContext = DefaultPollenServiceContext.newContext( - Locale.getDefault(), - transaction, - configuration, - serviceFactory - ); + try { + PollenServiceContext serviceContext = DefaultPollenServiceContext.newContext( + Locale.getDefault(), + transaction, + configuration, + serviceFactory + ); - PollenServiceSupport pollenServiceSupport = - serviceFactory.newService(PollenServiceSupport.class, serviceContext); + UserService service = + serviceFactory.newService(UserService.class, serviceContext); - List<PollType> pollTypes = - pollenServiceSupport.getEntities(PollType.class); + int nbUsers = service.getNbUsers(); + if (nbUsers == 0) { - if (CollectionUtils.isEmpty(pollTypes)) { + service.createDefaultUsers(); - // db is empty, let's create references - - - try { - createDefaultPollTypes(configuration, transaction); - - createDefaultChoiceTypes(configuration, transaction); - - createDefaultVoteCountings(configuration, transaction); - - createDefaultAdmin(serviceFactory, serviceContext); - transaction.commitTransaction(); - - } finally { - closeTransaction(transaction); } + } finally { + closeTransaction(transaction); } - } - private void createDefaultVoteCountings(PollenConfiguration configuration, TopiaContext transaction) throws TopiaException { - VoteCountingDAO voteCountingDAO = PollenDAOHelper.getVoteCountingDAO(transaction); - List<String> defaultVoteCountings = configuration.getDefaultVoteCountings(); - for (String defaultVoteCounting : defaultVoteCountings) { - if (log.isInfoEnabled()) { - log.info("Create default vote counting '" + defaultVoteCounting + "'"); - } - voteCountingDAO.create(VoteCounting.PROPERTY_NAME, defaultVoteCounting); - } } - private void createDefaultChoiceTypes(PollenConfiguration configuration, TopiaContext transaction) throws TopiaException { - ChoiceTypeDAO choiceTypeDAO = PollenDAOHelper.getChoiceTypeDAO(transaction); - List<String> defaultChoiceTypes = configuration.getDefaultChoiceTypes(); - for (String defaultChoiceType : defaultChoiceTypes) { - if (log.isInfoEnabled()) { - log.info("Create default choice type '" + defaultChoiceType + "'"); - } - choiceTypeDAO.create(ChoiceType.PROPERTY_NAME, defaultChoiceType); - } - } - - private void createDefaultPollTypes(PollenConfiguration configuration, TopiaContext transaction) throws TopiaException { - PollTypeDAO pollTypeDAO = PollenDAOHelper.getPollTypeDAO(transaction); - List<String> defaultPollTypes = configuration.getDefaultPollTypes(); - for (String defaultPollType : defaultPollTypes) { - if (log.isInfoEnabled()) { - log.info("Create default poll type '" + defaultPollType + "'"); - } - pollTypeDAO.create(PollType.PROPERTY_NAME, defaultPollType); - } - } - - - private void createDefaultAdmin(PollenServiceFactory serviceFactory, - PollenServiceContext serviceContext) { - - UserService service = - serviceFactory.newService(UserService.class, serviceContext); - - service.createDefaultUsers(); - - } - /** * Try to close the given transaction. * Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -24,9 +24,9 @@ package org.chorem.pollen.ui.actions.json; import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.impl.UserService; import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import java.util.List; import java.util.Map; @@ -76,7 +76,7 @@ polls = new Map[allUsers.size()]; Binder<UserAccount, UserAccount> binder = - BinderFactory.newBinder(UserAccount.class); + PollenBinderHelper.newBinder(UserAccount.class); int index = 0; for (UserAccount user : allUsers) { Map<String, Object> map = binder.obtainProperties(user); Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -23,12 +23,11 @@ */ package org.chorem.pollen.ui.actions.json; -import com.google.common.collect.Maps; import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import java.util.Map; @@ -64,11 +63,11 @@ UserAccount userAccount = userService.getEntityById(UserAccount.class, userId); - user = Maps.newHashMap(); - Binder<UserAccount, UserAccount> binder = - BinderFactory.newBinder(UserAccount.class); - user = binder.obtainProperties(userAccount); + PollenBinderHelper.newBinder(UserAccount.class); + user = binder.obtainProperties( + userAccount + ); user.put("id", userAccount.getTopiaId()); return SUCCESS; Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -24,9 +24,9 @@ package org.chorem.pollen.ui.actions.json; import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.services.impl.UserService; import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderFactory; import java.util.List; import java.util.Map; @@ -76,10 +76,12 @@ users = new Map[allUsers.size()]; Binder<UserAccount, UserAccount> binder = - BinderFactory.newBinder(UserAccount.class); + PollenBinderHelper.newBinder(UserAccount.class); int index = 0; for (UserAccount user : allUsers) { - Map<String, Object> map = binder.obtainProperties(user); + Map<String, Object> map = binder.obtainProperties( + user + ); map.put("id", user.getTopiaId()); users[index++] = map; } Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% @@ -25,17 +25,15 @@ import com.google.common.collect.Maps; import com.opensymphony.xwork2.Preparable; -import org.chorem.pollen.PollenFunctions; -import org.chorem.pollen.business.persistence.ChoiceType; import org.chorem.pollen.business.persistence.Poll; -import org.chorem.pollen.business.persistence.PollType; import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.business.persistence.VoteCounting; -import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.I18nAble; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.impl.PollService; import org.chorem.pollen.ui.actions.PollenActionSupport; -import java.util.List; import java.util.Map; /** @@ -50,11 +48,11 @@ protected Poll poll; - protected Map<String, PollType> pollTypes; + protected Map<Integer, String> pollTypes; - protected Map<String, VoteCounting> voteCountings; + protected Map<Integer, String> voteCountingTypes; - protected Map<String, ChoiceType> choiceTypes; + protected Map<Integer, String> choiceTypes; protected boolean notification; @@ -78,15 +76,15 @@ return poll; } - public Map<String, PollType> getPollTypes() { + public Map<Integer, String> getPollTypes() { return pollTypes; } - public Map<String, VoteCounting> getVoteCountings() { - return voteCountings; + public Map<Integer, String> getVoteCountingTypes() { + return voteCountingTypes; } - public Map<String, ChoiceType> getChoiceTypes() { + public Map<Integer, String> getChoiceTypes() { return choiceTypes; } @@ -150,21 +148,17 @@ @Override public void prepare() throws Exception { - PollenServiceSupport service = - newService(PollenServiceSupport.class); + pollTypes = decorate(PollType.values()); + choiceTypes = decorate(ChoiceType.values()); + voteCountingTypes = decorate(VoteCountingType.values()); - List<PollType> pollTypeList = service.getEntities(PollType.class); - pollTypes = Maps.uniqueIndex(pollTypeList, - PollenFunctions.ENTITY_BY_ID); + } - List<VoteCounting> voteCountingList = - service.getEntities(VoteCounting.class); - voteCountings = Maps.uniqueIndex(voteCountingList, - PollenFunctions.ENTITY_BY_ID); - - List<ChoiceType> choiceTypeList = service.getEntities(ChoiceType.class); - choiceTypes = Maps.uniqueIndex(choiceTypeList, - PollenFunctions.ENTITY_BY_ID); - + private <E extends Enum<E> & I18nAble> Map<Integer, String> decorate(E... values) { + Map<Integer, String> result = Maps.newLinkedHashMap(); + for (E value : values) { + result.put(value.ordinal(), getText(value.getI18nKey())); + } + return result; } } Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-30 20:43:30 UTC (rev 3122) @@ -38,6 +38,7 @@ pollen.common.pollOption.reminder=Envoyer des emails de rappel pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage pollen.common.pollType=Type de sondage +pollen.common.voteCountingType=Type de dépouillement pollen.common.title=Titre pollen.common.userSupport=Support utilisateur pollen.common.x=Dépouillement Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ # Pollen :: UI (strust2) # # $Id$ -# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ +# $HeadURL$ # %% # Copyright (C) 2009 - 2012 CodeLutin # %% @@ -25,6 +25,7 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%p] %c{2} %m%n +log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.nuiton=INFO Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ # Pollen :: UI (strust2) # # $Id$ -# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ +# $HeadURL$ # %% # Copyright (C) 2009 - 2012 CodeLutin # %% @@ -21,14 +21,19 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # #L% ### -hibernate.show_sql=false -hibernate.hbm2ddl.auto=update +#hibernate.show_sql=false +#hibernate.hbm2ddl.auto=update hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.username=sa hibernate.connection.password= hibernate.connection.driver_class=org.h2.Driver hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb +# Migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback +topia.service.migration.showSql=false + ## Version de l'application pollen.version=${project.version} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: checkbox.ftl 3112 2012-01-23 23:10:51Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: controlheader-core.ftl 3112 2012-01-23 23:10:51Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ #%L Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,7 +2,7 @@ #%L EchoBase :: UI $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -2,7 +2,7 @@ #%L EchoBase :: UI $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% @@ -34,6 +34,8 @@ <s:url id="loadUser" action="getUser" namespace="/json"/> +<s:set var="user" value="%{#session.pollenSession.userAccount}"/> + <script type="text/javascript"> jQuery(document).ready(function () { @@ -50,9 +52,15 @@ // listen row selection $.addRowSelectTopic('users'); + $.addClearSelectTopic('users', function(){ + $(".userForm").hide(); + }); + // to edit a selected row $.listenRowTopic('users-editRow', function (event) { if(!jQuery.struts2_jquery['users']) { + + // no user selected return; } var id = jQuery.struts2_jquery['users']['selectedRow']; @@ -88,9 +96,19 @@ // to delete the selected row $.listenRowTopic('users-deleteRow', function(event) { if(!jQuery.struts2_jquery['users']) { + + // no user selected return; } var id = jQuery.struts2_jquery['users']['selectedRow']; + var userId = '${user.topiaId}'; + + if (id == userId) { + + // can not delete connected user + return; + } + jQuery.getJSON("${loadUser}", { "userId":id }, function (result) { var user = result.user; @@ -114,7 +132,7 @@ pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editinline="false" - onCompleteTopics='users-cleanSelect' + onCompleteTopics='users-clearSelect' navigatorEdit="false" navigatorDelete="false" navigatorSearch="false" navigatorRefresh="false" navigatorAdd="false" viewrecords="true" @@ -140,7 +158,7 @@ <br/> -<s:form id='editForm' method="POST" namespace="/admin" cssClass="hidden"> +<s:form id='editForm' method="POST" namespace="/admin" cssClass="hidden userForm"> <s:hidden name="action" value="update"/> <s:hidden key="user.topiaId" label=""/> @@ -159,7 +177,7 @@ </s:form> -<s:form id='createForm' method="POST" namespace="/admin" cssClass="hidden"> +<s:form id='createForm' method="POST" namespace="/admin" cssClass="hidden userForm"> <s:hidden name="action" value="create"/> <fieldset> @@ -174,7 +192,7 @@ <s:submit action="createUser" key="pollen.action.create" align="center"/> </s:form> -<s:form id='deleteForm' method="POST" namespace="/admin" cssClass="hidden"> +<s:form id='deleteForm' method="POST" namespace="/admin" cssClass="hidden userForm"> <s:hidden name="action" value="delete"/> <s:hidden key="user.topiaId" label=""/> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% @@ -92,8 +92,8 @@ <s:textfield key="poll.description" label="%{getText('pollen.common.description')}"/> <sj:datepicker key="poll.beginDate" label="%{getText('pollen.common.beginDate')}" displayFormat="dd/mm/yy"/> <sj:datepicker key="poll.endDate" label="%{getText('pollen.common.endDate')}" displayFormat="dd/mm/yy"/> - <s:radio key='poll.type' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> - <s:radio key='poll.voteCounting' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> + <s:radio key='poll.pollType' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> + <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> </fieldset> <fieldset> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -4,7 +4,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/favicon.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1downarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1uparrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/7ter.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/close.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/contact.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/copy.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/count.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/delete.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/edit.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/editSmall.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/exclamation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/export.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/gplv3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/help.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/import.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/lutin.gif ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/save.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_en.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_fr.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menu.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/true.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/undo.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/vote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ Pollen :: UI (strust2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-30 20:43:30 UTC (rev 3122) @@ -3,7 +3,7 @@ * Pollen :: UI (strust2) * * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-struts... $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/doc/exportXML.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/doc/votecountingapi.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml 2012-01-30 20:43:30 UTC (rev 3122) @@ -28,10 +28,31 @@ <artifactId>jdom</artifactId> </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -23,6 +23,33 @@ */ package org.chorem.pollen.common; -public enum ChoiceType { - TEXT, DATE, IMAGE +import static org.nuiton.i18n.I18n.n_; + +public enum ChoiceType implements I18nAble { + TEXT(n_("pollen.choiceType.text")), + DATE(n_("pollen.choiceType.date")), + IMAGE(n_("pollen.choiceType.image")); + + private final String i18nKey; + + ChoiceType(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } + + public static ChoiceType valueOf(int ordinal) { + + ChoiceType result = null; + for (ChoiceType curr : ChoiceType.values()) { + if (curr.ordinal() == ordinal) { + result = curr; + break; + } + } + return result; + } } \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -0,0 +1,35 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.common; + +/** + * Contract to expose a i18n key. + * + * @author tchemit <chemit@codelutin.com> + * @since 1.2.6 + */ +public interface I18nAble { + + String getI18nKey(); +} Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/I18nAble.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -23,6 +23,33 @@ */ package org.chorem.pollen.common; -public enum PollType { - FREE, RESTRICTED, GROUP -} \ No newline at end of file +import static org.nuiton.i18n.I18n.n_; + +public enum PollType implements I18nAble { + + FREE(n_("pollen.pollType.free")), + RESTRICTED(n_("pollen.pollType.restricted")), + GROUP(n_("pollen.pollType.group")); + + private final String i18nKey; + + PollType(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } + + public static PollType valueOf(int ordinal) { + PollType result = null; + for (PollType curr : PollType.values()) { + if (curr.ordinal() == ordinal) { + result = curr; + break; + } + } + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-01-30 20:43:30 UTC (rev 3122) @@ -23,6 +23,33 @@ */ package org.chorem.pollen.common; -public enum VoteCountingType { - NORMAL, PERCENTAGE, CONDORCET, NUMBER -} +import static org.nuiton.i18n.I18n.n_; + +public enum VoteCountingType implements I18nAble { + NORMAL(n_("pollen.voteCountingType.normal")), + PERCENTAGE(n_("pollen.voteCountingType.percentage")), + CONDORCET(n_("pollen.voteCountingType.condorcet")), + NUMBER(n_("pollen.voteCountingType.number")); + + private final String i18nKey; + + VoteCountingType(String i18nKey) { + this.i18nKey = i18nKey; + } + + @Override + public String getI18nKey() { + return i18nKey; + } + + public static VoteCountingType valueOf(int ordinal) { + VoteCountingType result = null; + for (VoteCountingType curr : VoteCountingType.values()) { + if (curr.ordinal() == ordinal) { + result = curr; + break; + } + } + return result; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java ___________________________________________________________________ Modified: svn:keywords - Date Author Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_en_GB.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_en_GB.properties 2012-01-30 20:43:30 UTC (rev 3122) @@ -0,0 +1,10 @@ +pollen.choiceType.date=Date +pollen.choiceType.image=Image +pollen.choiceType.text=Text +pollen.pollType.free=Free +pollen.pollType.group=Group +pollen.pollType.restricted=Restricted +pollen.voteCountingType.condorcet=Condorcet +pollen.voteCountingType.normal=Normal +pollen.voteCountingType.number=Number +pollen.voteCountingType.percentage=Percentage Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_fr_FR.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_fr_FR.properties 2012-01-30 20:43:30 UTC (rev 3122) @@ -0,0 +1,10 @@ +pollen.choiceType.date=Date +pollen.choiceType.image=Image +pollen.choiceType.text=Texte +pollen.pollType.free=Libre +pollen.pollType.group=Groupe +pollen.pollType.restricted=Restreint +pollen.voteCountingType.condorcet=Condorcet +pollen.voteCountingType.normal=Normal +pollen.voteCountingType.number=Nombre +pollen.voteCountingType.percentage=Pourcentage Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/i18n/pollen-votecounting_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/CreerSondage.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/CreerSondage2.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/DC_Pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/DC_PreventRules.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/DET_PollState.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/Depouiller.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/Depouiller_1a.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/UC_Gestiondesvotes.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/Voter.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_BusinessDTOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_DBUtil.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServicePoll.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServiceResults.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServiceUser.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DC_ServiceVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/business/DS_Conception_CreerSondage.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/composants.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/packages.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/pollen_logo.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/schema-architecture.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/DC_UIOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/chart.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/dateTimeField.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/feedBack.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topCount.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/ui/topVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceExport.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceExportImpl.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceExportXML.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_ServiceVoteCountingImpl.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/DC_VoteCountingDTOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/schemas/votecounting/Seq-executeVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-4.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-5.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture-6.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Capture.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-links.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Creation-step4.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Results.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/resources/tutoriel/Vote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -26,8 +26,8 @@ :Author: Erwan NEMA <nemawan@hotmail.com> :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2738 $ -:Date: $Date: 2009-08-20 17:12:21 +0200 (jeu 20 aoû 2009) $ +:Revision: $Revision$ +:Date: $Date$ Les besoins ~~~~~~~~~~~ Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ==================================== :Author: Florian DESBOIS <florian.desbois@gmail.com> -:Revision: $Revision: 2613 $ -:Date: $Date: 2009-06-30 15:32:57 +0200 (mar 30 jun 2009) $ +:Revision: $Revision$ +:Date: $Date$ .. image:: schemas/schema-architecture.png :alt: Architecture global Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/assentiment.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ======== :Author: -:Revision: $Revision: 2613 $ -:Date: $Date: 2009-06-30 15:32:57 +0200 (mar 30 jun 2009) $ +:Revision: $Revision$ +:Date: $Date$ DTO --- Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/condorcet.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/depouillement.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/developer.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/historique.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ============ .. Author: Nolwenn Rannou <rannou@codelutin.com> -.. Revision: $Revision: 2760 $ -.. Date: $Date: 2009-08-27 17:10:53 +0200 (jeu 27 aoû 2009) $ +.. Revision: $Revision$ +.. Date: $Date$ Conteneur Web ------------- Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/nombre.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/pourcentage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ======== :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2759 $ -:Date: $Date: 2009-08-27 17:01:18 +0200 (jeu 27 aoû 2009) $ +:Revision: $Revision$ +:Date: $Date$ Nous allons voir à travers un exemple comment créer un sondage avec Pollen. Les trois étapes nécessaires sont les suivantes : la création, le vote et la visualisation des résultats. Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ == :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2613 $ -:Date: $Date: 2009-06-30 15:32:57 +0200 (mar 30 jun 2009) $ +:Revision: $Revision$ +:Date: $Date$ L'interface web de l'application a été créée grâce au framework Tapestry de la fondation Apache. Tapestry est un framework de développement pour applications Web J2EE dont l'architecture est à base de composants. Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/user.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ============ :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2613 $ -:Date: $Date: 2009-06-30 15:32:57 +0200 (mar 30 jun 2009) $ +:Revision: $Revision$ +:Date: $Date$ Cette partie décrit l'implémentation du module VoteCounting. Property changes on: branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/CreerSondage.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/CreerSondage2.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/DC_Pollen.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/DC_PreventRules.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/DET_PollState.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/Depouiller.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/Depouiller_1a.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/UC_Gestiondesvotes.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/Voter.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_BusinessDTOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_DBUtil.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServicePoll.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServiceResults.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServiceUser.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DC_ServiceVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/business/DS_Conception_CreerSondage.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/composants.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/packages.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/pollen_logo.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/schema-architecture.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/DC_UIOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/chart.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/dateTimeField.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/feedBack.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topCount.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topCreation.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topIndex.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/ui/topVote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceExport.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceExportImpl.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceExportXML.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_ServiceVoteCountingImpl.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/DC_VoteCountingDTOs.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/schemas/votecounting/Seq-executeVoteCounting.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-4.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-5.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture-6.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Capture.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-links.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step1.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step2.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step3.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Creation-step4.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Results.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/resources/tutoriel/Vote.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -26,8 +26,8 @@ :Author: Erwan NEMA <nemawan@hotmail.com> :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ +:Revision: $Revision$ +:Date: $Date$ The needs ~~~~~~~~~ Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/approval.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ =================== :Author: Florian DESBOIS <florian.desbois@gmail.com> -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ +:Revision: $Revision$ +:Date: $Date$ .. image:: schemas/schema-architecture.png :alt: Global architecture Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/rst/business.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/business.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/business.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ======== :Author: -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ +:Revision: $Revision$ +:Date: $Date$ DTO --- Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/business.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/condorcet.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/developer.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/historical.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/rst/install.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/install.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/install.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ================== .. Author: Nolwenn Rannou <rannou@codelutin.com> -.. Revision: $Revision: 2779 $ -.. Date: $Date: 2009-10-12 14:29:43 +0200 (lun., 12 oct. 2009) $ +.. Revision: $Revision$ +.. Date: $Date$ .. contents:: Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/install.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/methods.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/number.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/percentage.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ======== :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ +:Revision: $Revision$ +:Date: $Date$ We will see through an example, how to create a poll with Pollen. The three necessary steps are: Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/rst/ui.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/ui.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/ui.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ == :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ +:Revision: $Revision$ +:Date: $Date$ The application web interface has been created with Tapestry framework from Apache foundation. Tapestry is a development framework for Web J2EE applications Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/ui.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/user.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst 2012-01-30 01:14:44 UTC (rev 3121) +++ branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst 2012-01-30 20:43:30 UTC (rev 3122) @@ -25,8 +25,8 @@ ============ :Author: Nolwenn Rannou <rannou@codelutin.com> -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ +:Revision: $Revision$ +:Date: $Date$ This part describe the VoteCounting module implementation. Property changes on: branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/todo.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native