- Pollen-commits - mailman.cloud.codelutin.com

r3055 - trunk/pollen-ui/src/main/webapp/WEB-INF
by echatellier＠users.chorem.org 01 Dec '10

01 Dec '10

Author: echatellier Date: 2010-12-01 18:17:52 +0100 (Wed, 01 Dec 2010) New Revision: 3055 Url: http://chorem.org/repositories/revision/pollen/3055 Log: Use xsd instead of dtd Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml 2010-11-28 20:20:23 UTC (rev 3054) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml 2010-12-01 17:17:52 UTC (rev 3055) @@ -39,10 +39,10 @@ limitations under the License. --> -<!DOCTYPE web-app - PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd"> -<web-app> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> <display-name>Pollen</display-name> <context-param> <!-- The only significant configuration for Tapestry 5, this informs Tapestry

1 0

r3054 - trunk
by tchemit＠users.chorem.org 28 Nov '10

28 Nov '10

Author: tchemit Date: 2010-11-28 21:20:23 +0100 (Sun, 28 Nov 2010) New Revision: 3054 Url: http://chorem.org/repositories/revision/pollen/3054 Log: use last dev version of eugene and topia Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 23:05:17 UTC (rev 3053) +++ trunk/pom.xml 2010-11-28 20:20:23 UTC (rev 3054) @@ -327,8 +327,8 @@   - <topiaVersion>2.4.2</topiaVersion> - <eugenePluginVersion>2.1.1</eugenePluginVersion> + <topiaVersion>2.5-SNAPSHOT</topiaVersion> + <eugenePluginVersion>2.3-SNAPSHOT</eugenePluginVersion> <nuitonI18nVersion>1.2.2</nuitonI18nVersion> <tapestryVersion>5.1.0.5</tapestryVersion> <nuitonWebVersion>0.1</nuitonWebVersion>

1 0

r3053 - in trunk: . pollen-business pollen-business/src pollen-business/src/license pollen-business/src/main/java/org/chorem/pollen pollen-business/src/main/java/org/chorem/pollen/bean pollen-business/src/main/java/org/chorem/pollen/entity pollen-business/src/main/java/org/chorem/pollen/mail pollen-business/src/main/java/org/chorem/pollen/service pollen-business/src/main/resources pollen-business/src/main/xmi pollen-business/src/test/java/org/chorem/pollen/service pollen-business/src/test/j
by tchemit＠users.chorem.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-22 00:05:17 +0100 (Mon, 22 Nov 2010) New Revision: 3053 Url: http://chorem.org/repositories/revision/pollen/3053 Log: reformat poms consolidate third-parties optimize dependencies add update db in default configuration (to have a h2 db when first launch) update headers to agpl v3 Added: trunk/pollen-business/src/license/ trunk/pollen-business/src/license/THIRD-PARTY.properties trunk/pollen-ui/src/license/ trunk/pollen-ui/src/license/THIRD-PARTY.properties trunk/pollen-votecounting/src/license/ trunk/pollen-votecounting/src/license/THIRD-PARTY.properties Modified: trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/PollenBusinessException.java trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContext.java trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java trunk/pollen-business/src/main/java/org/chorem/pollen/PollenProperty.java trunk/pollen-business/src/main/java/org/chorem/pollen/PollenUtils.java trunk/pollen-business/src/main/java/org/chorem/pollen/bean/PollenEmailImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/bean/UserPollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteListImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ParticipantHelper.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/entity/VoteImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorker.java trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorkerImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/mail/MailUtil.java trunk/pollen-business/src/main/java/org/chorem/pollen/mail/PreventRuleManager.java trunk/pollen-business/src/main/java/org/chorem/pollen/mail/SendMail.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceEmailImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceFavoriteImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java trunk/pollen-business/src/main/resources/log4j.properties trunk/pollen-business/src/main/resources/pollen.properties trunk/pollen-business/src/main/xmi/pollen.properties trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceFavoriteImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceUserImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceVoteImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java trunk/pollen-business/src/test/resources/PollenTest.properties trunk/pollen-business/src/test/resources/largemaillist.sh trunk/pollen-business/src/test/resources/log4j.properties trunk/pollen-ui/pom.xml trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollenPage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollsPage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractUploadPage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/PollenPage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/package-info.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceDateForm.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImageForm.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceTextForm.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/SubForm.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsCreate.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/package-info.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBar.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBarItem.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ChoiceField.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ErrorReport.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/EvenOdd.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/FieldValidationException.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/GenericEncoder.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ParticipantsListener.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollAction.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollHelper.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollUri.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollenRequiresAuthentication.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/package-info.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/PollenExceptionsFilter.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/package-info.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/FavoriteParticipantDataSource.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/GenericSelectModel.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/ParticipantListModel.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/UserAccountDataSource.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Connection.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/ErrorPage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Index.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/LocalMessages.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminPolls.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/package-info.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CloseValidation.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CreationValidation.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ModificationValidation.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollLinks.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserLists.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsCreated.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsParticipated.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserProfile.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserRegister.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthentication.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthenticationFilter.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenManager.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImage.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImageImpl.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUri.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUriImpl.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/package-info.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVAccountUtil.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/FeedUtil.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/LDAPAccountUtil.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/UnitConverter.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/package-info.java trunk/pollen-ui/src/main/resources/log4j.properties trunk/pollen-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties trunk/pollen-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceDateForm.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceImageForm.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceTextForm.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Image.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/SubForm.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsCreate.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_fr.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_fr.properties trunk/pollen-ui/src/main/webapp/Connection.tml trunk/pollen-ui/src/main/webapp/ErrorPage.tml trunk/pollen-ui/src/main/webapp/Index.tml trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml trunk/pollen-ui/src/main/webapp/admin/AdminPolls.tml trunk/pollen-ui/src/main/webapp/admin/AdminUsers.tml trunk/pollen-ui/src/main/webapp/css/account.css trunk/pollen-ui/src/main/webapp/css/common.css trunk/pollen-ui/src/main/webapp/css/grid.css trunk/pollen-ui/src/main/webapp/css/lightbox.css trunk/pollen-ui/src/main/webapp/css/main.css trunk/pollen-ui/src/main/webapp/css/poll.css trunk/pollen-ui/src/main/webapp/css/pollCreation.css trunk/pollen-ui/src/main/webapp/css/pollsAdmin.css trunk/pollen-ui/src/main/webapp/css/pollsCreated.css trunk/pollen-ui/src/main/webapp/css/pollsParticipated.css trunk/pollen-ui/src/main/webapp/css/register.css trunk/pollen-ui/src/main/webapp/css/results.css trunk/pollen-ui/src/main/webapp/css/users.css trunk/pollen-ui/src/main/webapp/css/usersAdmin.css trunk/pollen-ui/src/main/webapp/css/vote.css trunk/pollen-ui/src/main/webapp/poll/CloseValidation.tml trunk/pollen-ui/src/main/webapp/poll/ConfirmPoll.tml trunk/pollen-ui/src/main/webapp/poll/CreationValidation.tml trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml trunk/pollen-ui/src/main/webapp/poll/ModificationValidation.tml trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml trunk/pollen-ui/src/main/webapp/poll/PollForm.tml trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml trunk/pollen-ui/src/main/webapp/poll/PollModification.tml trunk/pollen-ui/src/main/webapp/poll/Results.tml trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml trunk/pollen-ui/src/main/webapp/user/UserLists.tml trunk/pollen-ui/src/main/webapp/user/UserPollsCreated.tml trunk/pollen-ui/src/main/webapp/user/UserPollsParticipated.tml trunk/pollen-ui/src/main/webapp/user/UserProfile.tml trunk/pollen-ui/src/main/webapp/user/UserRegister.tml trunk/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/CSVAccountUtilTest.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java trunk/pollen-votecounting/src/main/resources/log4j.properties trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java trunk/pom.xml trunk/src/license/project.xml trunk/src/site/fr/rst/analyse.rst trunk/src/site/fr/rst/architecture.rst trunk/src/site/fr/rst/assentiment.rst trunk/src/site/fr/rst/business.rst trunk/src/site/fr/rst/condorcet.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/developer.rst trunk/src/site/fr/rst/historique.rst trunk/src/site/fr/rst/importVotersList.rst trunk/src/site/fr/rst/index.rst trunk/src/site/fr/rst/install.rst trunk/src/site/fr/rst/nombre.rst trunk/src/site/fr/rst/pourcentage.rst trunk/src/site/fr/rst/tutoriel.rst trunk/src/site/fr/rst/ui.rst trunk/src/site/fr/rst/user.rst trunk/src/site/fr/rst/votecounting.rst trunk/src/site/rst/analyse.rst trunk/src/site/rst/approval.rst trunk/src/site/rst/architecture.rst trunk/src/site/rst/business.rst trunk/src/site/rst/condorcet.rst trunk/src/site/rst/developer.rst trunk/src/site/rst/historical.rst trunk/src/site/rst/importVotersList.rst trunk/src/site/rst/index.rst trunk/src/site/rst/install.rst trunk/src/site/rst/methods.rst trunk/src/site/rst/number.rst trunk/src/site/rst/percentage.rst trunk/src/site/rst/tutoriel.rst trunk/src/site/rst/ui.rst trunk/src/site/rst/user.rst trunk/src/site/rst/votecounting.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/pom.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,197 +1,212 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> -  -  -  +  +  +  - <parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>2.0-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-business</artifactId> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + </dependency> +  + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + </dependencies> - <groupId>org.chorem.pollen</groupId> - <artifactId>pollen-business</artifactId> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>pollen-votecounting</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - </dependencies> +  +  +  -  -  -  + <name>Pollen :: Business</name> + <description>Partie métier de Pollen</description> - <name>Pollen :: Business</name> - <description>Partie métier de Pollen</description> +  +  +  -  -  -  + <packaging>jar</packaging> - <packaging>jar</packaging> + <build> - <build> + <plugins> - <plugins> +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <id>generate-entities</id> +  + <configuration> +  + <fullPackagePath>org.chorem.pollen</fullPackagePath> +  + <defaultPackage>org.chorem.pollen</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.ServiceTransformer, + org.nuiton.eugene.java.JavaInterfaceTransformer, + org.nuiton.eugene.java.JavaBeanTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <configuration> + <entries> + <entry> + <basedir>${maven.gen.dir}/java</basedir> + </entry> + </entries> + </configuration> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + <execution> + <id>make-bundle</id> + <configuration> + <bundleOutputName>pollen-business</bundleOutputName> + </configuration> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> +  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <id>generate-entities</id> -  - <configuration> -  - <fullPackagePath>org.chorem.pollen</fullPackagePath> -  - <defaultPackage>org.chorem.pollen</defaultPackage> - <templates> - org.nuiton.topia.generator.TopiaMetaTransformer, - org.nuiton.topia.generator.ServiceTransformer, - org.nuiton.eugene.java.JavaInterfaceTransformer, - org.nuiton.eugene.java.JavaBeanTransformer, - org.nuiton.topia.generator.BinderHelperTransformer, - org.nuiton.topia.generator.QueryHelperTransformer - </templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <executions> - <execution> - <configuration> - <entries> - <entry> - <basedir>${maven.gen.dir}/java</basedir> - </entry> - </entries> - </configuration> - <goals> - <goal>parserJava</goal> - <goal>gen</goal> - </goals> - </execution> - <execution> - <id>make-bundle</id> - <configuration> - <bundleOutputName>pollen-business</bundleOutputName> - </configuration> - <goals> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> -  + </plugins> + </build> - <execution> - <phase>generate-sources</phase> - Configuration of model generator - <configuration> - reader>org.nuiton.eugene.ObjectModelReader</reader - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> - <defaultPackage>org.chorem.pollen.business.persistence</defaultPackage> - <extractedPackages>org.chorem.pollen.business.persistence</extractedPackages> - <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/pollen</copyVersionDir> - <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <overwrite>true</overwrite> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - <goal>copyVersionFiles</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin>--> - </plugins> - </build> - </project> Added: trunk/pollen-business/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-business/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/pollen-business/src/license/THIRD-PARTY.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -0,0 +1,25 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun Nov 21 23:38:07 CET 2010 +antlr--antlr--2.7.6--jar=BSD License +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jdom--jdom--1.1--jar=Lesser General Public License (LGPL) v 3.0 Property changes on: trunk/pollen-business/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenBusinessException.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenBusinessException.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenBusinessException.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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; import static org.nuiton.i18n.I18n.n_; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContext.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContext.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContext.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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; import java.util.Date; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenContextImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenException.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenProperty.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenProperty.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenProperty.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/PollenUtils.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/PollenUtils.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/PollenUtils.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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; import org.apache.commons.logging.Log; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/bean/PollenEmailImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/bean/PollenEmailImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/bean/PollenEmailImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.bean; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/bean/UserPollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/bean/UserPollImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/bean/UserPollImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.bean; import org.chorem.pollen.entity.PollAccount; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteListImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteListImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteListImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.chorem.pollen.PollenBusinessException; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantDAOImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.chorem.pollen.PollenQueryHelper; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/FavoriteParticipantImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; /** Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ParticipantHelper.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ParticipantHelper.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/ParticipantHelper.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.apache.commons.logging.Log; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountDAOImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.chorem.pollen.PollenContext; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollAccountImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.apache.commons.logging.Log; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollDAOImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; import org.chorem.pollen.PollenContext; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/PollImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/entity/VoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/entity/VoteImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/entity/VoteImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.entity; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorker.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorker.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorker.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorkerImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorkerImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/mail/BackgroundWorkerImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/mail/MailUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/mail/MailUtil.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/mail/MailUtil.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/mail/PreventRuleManager.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/mail/PreventRuleManager.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/mail/PreventRuleManager.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/mail/SendMail.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/mail/SendMail.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/mail/SendMail.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceEmailImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceEmailImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceEmailImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceFavoriteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceFavoriteImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceFavoriteImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; import org.apache.commons.lang.StringUtils; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServicePollImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; import org.apache.commons.collections.CollectionUtils; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceUserImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/service/ServiceVoteImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; import org.apache.commons.lang.StringUtils; Modified: trunk/pollen-business/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-business/src/main/resources/log4j.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/resources/log4j.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-business/src/main/resources/pollen.properties =================================================================== --- trunk/pollen-business/src/main/resources/pollen.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/resources/pollen.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,6 +1,30 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### ## Configuration de la base de donn\u00C3\u00A9es #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= @@ -56,4 +80,4 @@ ##siteUrl= ## Version de l'application -version=${project.version} \ No newline at end of file +version=${project.version} Modified: trunk/pollen-business/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-business/src/main/xmi/pollen.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/main/xmi/pollen.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### # Pr\u00e9cise l'ent\u00eate de l'ensemble des fichiers g\u00e9n\u00e9r\u00e9s model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Pollen\n *##%*/ # toString are particularly difficult to use because of lazy initialization @@ -29,4 +52,4 @@ org.chorem.pollen.entity.Poll.attribute.uid.tagvalue.naturalId=true org.chorem.pollen.entity.Poll.attribute.creator.tagvalue.lazy=false -org.chorem.pollen.entity.Vote.attribute.choice.tagvalue.lazy=false \ No newline at end of file +org.chorem.pollen.entity.Vote.attribute.choice.tagvalue.lazy=false Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceFavoriteImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceFavoriteImplTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceFavoriteImplTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServicePollImplTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; import org.apache.commons.logging.Log; Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceUserImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceUserImplTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceUserImplTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; @@ -268,4 +291,4 @@ } } -} \ No newline at end of file +} Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceVoteImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceVoteImplTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/service/ServiceVoteImplTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.service; import org.apache.commons.logging.Log; Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/test/AbstractServiceTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Business + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.test; import org.apache.commons.beanutils.PropertyUtils; Modified: trunk/pollen-business/src/test/resources/PollenTest.properties =================================================================== --- trunk/pollen-business/src/test/resources/PollenTest.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/resources/PollenTest.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### hibernate.hbm2ddl.auto=create hibernate.show_sql=true hibernate.dialect=org.hibernate.dialect.H2Dialect @@ -9,4 +32,4 @@ adminLogin=admin adminPassword=admin -pollen.emails.directory=target/test-emails \ No newline at end of file +pollen.emails.directory=target/test-emails Modified: trunk/pollen-business/src/test/resources/largemaillist.sh =================================================================== --- trunk/pollen-business/src/test/resources/largemaillist.sh 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/resources/largemaillist.sh 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #!/bin/sh for i in `seq 0 3000`; do echo "\"Test $i\",\"toto+pollen+$i(a)domain.com\",1" >> test3000.csv; done Modified: trunk/pollen-business/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-business/src/test/resources/log4j.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-business/src/test/resources/log4j.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=warn, A1 Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/pom.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -25,18 +25,42 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting</artifactId> + <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> </dependency> <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-tapestry-extra</artifactId> </dependency> @@ -55,16 +79,26 @@ <dependency> <groupId>org.chenillekit</groupId> <artifactId>chenillekit-tapestry</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>jfree</groupId> <artifactId>jfreechart</artifactId> </dependency> <dependency> + <groupId>jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> + <scope>runtime</scope> </dependency> <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </dependency> + <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> @@ -89,6 +123,16 @@ <artifactId>winstone</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> </dependencies>  @@ -106,7 +150,8 @@ <packaging>war</packaging> <properties> - <redmine.releaseFiles>target/${project.build.finalName}.war + <redmine.releaseFiles> + target/${project.build.finalName}.war </redmine.releaseFiles> <i18n.collectOutputName>app</i18n.collectOutputName> @@ -119,7 +164,7 @@ <plugin> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-component-report</artifactId> - <version>${tapestry.version}</version> + <version>${tapestryVersion}</version> <configuration> <rootPackage>org.chorem.pollen.ui</rootPackage> </configuration> @@ -177,7 +222,7 @@ <configuration> <connectors> <connector - implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> <port>8888</port> </connector> </connectors> Added: trunk/pollen-ui/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/pollen-ui/src/license/THIRD-PARTY.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -0,0 +1,36 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2 +# - Apache Software License 2.0 +# - BSD License +# - BSD licence +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 +# - Common Public License Version 1.0 +# - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 +# - GNU Lesser General Public Licence +# - GNU Lesser General Public License +# - GNU Lesser General Public License version 2.1 +# - Lesser General Public License (LGPL) v 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The BSD License +# - The OpenSymphony Software License, Version 1.1 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun Nov 21 23:12:55 CET 2010 +antlr--antlr--2.7.6--jar=BSD License +commons-beanutils--commons-beanutils-core--1.7.0--jar=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javassist--javassist--3.8.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jdom--jdom--1.0--jar=The Apache Software License, Version 2.0 +ognl--ognl--2.7.3--jar=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.1--jar=BSD licence +org.jdom--jdom--1.1--jar=Lesser General Public License (LGPL) v 3.0 Property changes on: trunk/pollen-ui/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollenPage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollenPage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollenPage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.base; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollsPage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollsPage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractPollsPage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractUploadPage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractUploadPage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/AbstractUploadPage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.base; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/ContextLink.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.base; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/PollenPage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/PollenPage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/PollenPage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.base; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/base/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Classes de base ne devant pas être traitées par Tapestry comme des composants. */ -package org.chorem.pollen.ui.base; \ No newline at end of file +package org.chorem.pollen.ui.base; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Chart.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -207,4 +230,4 @@ } }; } -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceDateForm.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceDateForm.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceDateForm.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; import org.apache.tapestry5.annotations.Parameter; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; import org.apache.commons.lang.StringUtils; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImageForm.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImageForm.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceImageForm.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; import org.apache.tapestry5.annotations.Parameter; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceTextForm.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceTextForm.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/ChoiceTextForm.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; import org.apache.tapestry5.annotations.Parameter; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FeedContextLink.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/FileLink.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -130,4 +153,4 @@ } } -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/HeadLink.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -131,4 +154,4 @@ } } -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Pager.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/SubForm.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/SubForm.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/SubForm.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; import org.apache.tapestry5.Block; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsCreate.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsCreate.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsCreate.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,128 +1,151 @@ - -package org.chorem.pollen.ui.components; - -import org.apache.tapestry5.Field; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.InjectContainer; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.ioc.Messages; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenBusinessException.PollenExceptionType; -import org.chorem.pollen.entity.FavoriteList; -import org.chorem.pollen.entity.FavoriteParticipant; -import org.chorem.pollen.entity.UserAccount; -import org.chorem.pollen.service.ServiceFavorite; -import org.chorem.pollen.ui.base.PollenPage; -import org.chorem.pollen.ui.services.PollenManager; -import org.slf4j.Logger; - -/** - * Component to create a new FavoriteList using the {@code createList} form. - * - * Created: 27 avr. 2010 - * - * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Id$ - */ -public class UserListsCreate { - - /** Container **/ - @InjectContainer - private PollenPage page; - - /** Services injected **/ - @Inject - private Logger logger; - - @Inject - private Messages messages; - - @Inject - private PollenManager manager; - - @Inject - private ServiceFavorite serviceFavorite; - - /** Properties **/ - @Property - private FavoriteList newFavoriteList; - - /** Components injected **/ - @InjectComponent - private Field listName; - - @InjectComponent - private Form createList; - - /** - * SETUP_RENDER :: Callback method called when the component is rendered. - * Will clean errors from {@code createList} form. - */ - void setupRender() { - createList.clearErrors(); - } - - /** - * ON_PREPARE :: Callback method for both prepareRender and prepareSubmit - * events of {@code createList} form. Will instantiate a new instance - * of FavoriteList using {@code serviceFavorite} and user connected. - * - * @see ServiceFavorite#getNewFavoriteList(UserAccount) - */ - void onPrepareFromCreateList() { - if (newFavoriteList == null) { - if (logger.isDebugEnabled()) { - logger.debug("User connected : " + page.getUserConnected()); - } - newFavoriteList = - serviceFavorite.getNewFavoriteList(page.getUserConnected()); - } - } - - /** - * ON_VALIDATE_FORM :: Callback method for validateForm event of the - * {@code createList} form. The {@code newFavoriteList} will be created - * using {@code serviceFavorite}. Errors from service will be recorded - * into the {@code createList} form. - * - * @see ServiceFavorite#createFavoriteParticipant(FavoriteParticipant) - */ - void onValidateFormFromCreateList() { - try { - serviceFavorite.createFavoriteList(newFavoriteList); - } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); - - if (logger.isDebugEnabled()) { - logger.debug(message); - } - if (eee.getType().equals( - PollenExceptionType.FAVORITE_LIST_NAME_EXIST)) { - createList.recordError(listName, message); - } else { - createList.recordError(message); - } - } - } - - /** - * ON_SUCCESS :: Callback method for success event of the {@code createList} - * form. Will display a success message and refresh the {@code page} - * container. - */ - Object onSuccessFromCreateList() { - page.addInfo(messages.format("pollen.ui.list.create.success", - newFavoriteList.getName())); - return page; - } - - /** - * ON_FAILURE :: Callback method for failure event of the {@code createList} - * form. Will refresh the form (included in a zone} to display errors. - */ - Object onFailureFromCreateList() { - return createList; - } -} +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; + +import org.apache.tapestry5.Field; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.InjectContainer; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.corelib.components.Form; +import org.apache.tapestry5.ioc.Messages; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.chorem.pollen.PollenBusinessException; +import org.chorem.pollen.PollenBusinessException.PollenExceptionType; +import org.chorem.pollen.entity.FavoriteList; +import org.chorem.pollen.entity.FavoriteParticipant; +import org.chorem.pollen.entity.UserAccount; +import org.chorem.pollen.service.ServiceFavorite; +import org.chorem.pollen.ui.base.PollenPage; +import org.chorem.pollen.ui.services.PollenManager; +import org.slf4j.Logger; + +/** + * Component to create a new FavoriteList using the {@code createList} form. + * + * Created: 27 avr. 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +public class UserListsCreate { + + /** Container **/ + @InjectContainer + private PollenPage page; + + /** Services injected **/ + @Inject + private Logger logger; + + @Inject + private Messages messages; + + @Inject + private PollenManager manager; + + @Inject + private ServiceFavorite serviceFavorite; + + /** Properties **/ + @Property + private FavoriteList newFavoriteList; + + /** Components injected **/ + @InjectComponent + private Field listName; + + @InjectComponent + private Form createList; + + /** + * SETUP_RENDER :: Callback method called when the component is rendered. + * Will clean errors from {@code createList} form. + */ + void setupRender() { + createList.clearErrors(); + } + + /** + * ON_PREPARE :: Callback method for both prepareRender and prepareSubmit + * events of {@code createList} form. Will instantiate a new instance + * of FavoriteList using {@code serviceFavorite} and user connected. + * + * @see ServiceFavorite#getNewFavoriteList(UserAccount) + */ + void onPrepareFromCreateList() { + if (newFavoriteList == null) { + if (logger.isDebugEnabled()) { + logger.debug("User connected : " + page.getUserConnected()); + } + newFavoriteList = + serviceFavorite.getNewFavoriteList(page.getUserConnected()); + } + } + + /** + * ON_VALIDATE_FORM :: Callback method for validateForm event of the + * {@code createList} form. The {@code newFavoriteList} will be created + * using {@code serviceFavorite}. Errors from service will be recorded + * into the {@code createList} form. + * + * @see ServiceFavorite#createFavoriteParticipant(FavoriteParticipant) + */ + void onValidateFormFromCreateList() { + try { + serviceFavorite.createFavoriteList(newFavoriteList); + } catch (PollenBusinessException eee) { + String message = manager.getErrorMessage(logger, messages, eee); + + if (logger.isDebugEnabled()) { + logger.debug(message); + } + if (eee.getType().equals( + PollenExceptionType.FAVORITE_LIST_NAME_EXIST)) { + createList.recordError(listName, message); + } else { + createList.recordError(message); + } + } + } + + /** + * ON_SUCCESS :: Callback method for success event of the {@code createList} + * form. Will display a success message and refresh the {@code page} + * container. + */ + Object onSuccessFromCreateList() { + page.addInfo(messages.format("pollen.ui.list.create.success", + newFavoriteList.getName())); + return page; + } + + /** + * ON_FAILURE :: Callback method for failure event of the {@code createList} + * form. Will refresh the form (included in a zone} to display errors. + */ + Object onFailureFromCreateList() { + return createList; + } +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,329 +1,352 @@ -package org.chorem.pollen.ui.components; - -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.Log; -import org.apache.tapestry5.annotations.Parameter; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.ioc.Messages; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.entity.FavoriteList; -import org.chorem.pollen.entity.FavoriteParticipant; -import org.chorem.pollen.service.ServiceFavorite; -import org.chorem.pollen.ui.data.EvenOdd; -import org.chorem.pollen.ui.models.FavoriteParticipantDataSource; -import org.chorem.pollen.ui.services.PollenManager; -import org.nuiton.topia.framework.EntityFilter; -import org.nuiton.web.tapestry5.components.FeedBack; -import org.slf4j.Logger; - -/** - * Component to manage FavoriteParticipant in a FavoriteList as {@code source}. - * The {@code participants} are displayed in an editable Grid surrounded by an - * unique Zone {@code updateZone}. Two forms are used, one to add a new - * participant in the Grid and one to edit a participant directly in the grid. - * Each action will return the {@code updateZone} to refresh data loaded by - * {@link #getParticipants()} method. - * <p/> - * Created: 27 avr. 2010 - * - * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Id$s - */ -public class UserListsUpdate { - - /** Parameters of the component * */ - @Parameter(required = true) - private FavoriteList source; - - /** Services injected * */ - @Inject - private Logger logger; - - @Inject - private ServiceFavorite serviceFavorite; - - @Inject - private PollenManager manager; - - @Inject - private Messages messages; - - /** Main properties for Grid * */ - private EvenOdd evenOdd; - - private FavoriteParticipantDataSource participants; - - @Property - private FavoriteParticipant participant; - - @InjectComponent - private Zone updateZone; - - public EvenOdd getEvenOdd() { - if (evenOdd == null) { - evenOdd = new EvenOdd(); - } - return evenOdd; - } - - public boolean canDisplayAccounts() { - return source != null; - } - - /** - * Load participants data from serviceFavorite in a {@link - * FavoriteParticipantDataSource} to manage pagination and order. The filter - * added contains data for serviceFavorite (startIndex, endIndex, orderBy - * and referenceId). The reference is set to the source FavoriteList of the - * component, i.e. all FavoriteParticipants need to be part of the - * FavoriteList source. - * - * @return the DataSource that contains participants. - */ - public FavoriteParticipantDataSource getParticipants() { - if (participants == null) { - if (logger.isDebugEnabled()) { - logger.debug("Create DATASOURCE"); - } - EntityFilter filter = manager.getNewFilter(); - filter.setReference(source); - participants = - new FavoriteParticipantDataSource(serviceFavorite, filter); - } - return participants; - } - - /***************************** EDIT PARTICIPANT FORM **********************/ - - /** - * FORM EVENTS ORDER -> RENDER : - * <p /> - * <ul> - * <li>load size of participants dataSource</li> - * <li>call prepareForRender</li> - * <li>load participants data</li> - * </ul> - * <p/> - * FORM EVENTS ORDER -> SUBMIT : - * <p /> - * <ul> - * <li>all prepareForSubmit</li> - * <li>load size of participants dataSource</li> - * <li>load participants data</li> - * <li>load participantEdited to push form data (hidden fields in first)</li> - * <li>call selected on submit button</li> - * <li>call validateForm</li> - * <li>call success or failure</li> - * <li>call submit</li> - * </ul> - */ - - @InjectComponent - private Form participantsForm; - - @InjectComponent - private FeedBack participantsFeedback; - - private FavoriteParticipant participantEdited; - - @Property - private String participantEditedId; - - /** - * Test if the edited participant is the current one in the Grid. - * - * @return true if the participantEdited is defined and correspond to the - * current participant in the Grid - */ - public boolean isEditionMode() { - // The current participant in the loop is equals to the edited one - return participantEditedId != null && - participant.getId().equals(participantEditedId); - } - - /** - * ON_ACTION :: Callback method for action on editParticipant actionLink. The - * participantEdited will be set to the participant selected in the Grid - * with {@code id}. - * - * @param id key of the participant from the Grid - * @return the updateZone content to refresh - */ - Object onActionFromEditParticipant(String id) { - if (logger.isDebugEnabled()) { - logger.debug("Participant in edition : " + id); - } - participantEditedId = id; - return updateZone.getBody(); - } - - /** - * ON_ACTION :: Callback method for action on cancelEdition actionLink. - * Simply refresh the zone will change edition mode. - * - * @return the updateZone content to refresh - */ - Object onActionFromCancelEdition() { - return updateZone.getBody(); - } - - /** - * ON_ACTION :: Callback method for action on removeParticipant actionLink. - * The selected id from the Grid will be used to delete the participant. - * - * @param id used to delete the participant - * @return the updateZone content to refresh - * @see ServiceFavorite#deleteFavoriteParticipant(String) - */ - Object onActionFromRemoveParticipant(String id) { - serviceFavorite.deleteFavoriteParticipant(id); - participantsFeedback.addInfo( - messages.get("pollen.ui.list.update.removeParticipant.success")); - return updateZone; - } - - /** - * Getter to retrieve participantEdited. <br \> The participantEditedId is - * needed and was provided for render by the {@link #onActionFromEditParticipant(String)} - * method and for submit by the hidden field in the form that keep the id - * after rendering the form. The participantEdited is loaded from the - * participants dataSource that contains all FavoriteParticipant displayed - * in the Grid. The submit will reload the participants dataSource before - * saving modification on the FavoriteParticipant edited. - * - * @return the FavoriteParticipant in edition - */ - public FavoriteParticipant getParticipantEdited() { - if (participantEdited == null && participantEditedId != null) { - if (logger.isDebugEnabled()) { - logger.debug("Load from dataSource participantEditedId : " + - participantEditedId); - } - participantEdited = participants.get(participantEditedId); - } - return participantEdited; - } - - /** - * ON_VALIDATE_FORM :: Callback method for validateForm event of the - * participantsForm. The participantEdited will be updated using - * serviceFavorite. Errors from service will be recorded into the - * participantsForm. - * - * @see ServiceFavorite#updateFavoriteParticipant(FavoriteParticipant) - */ - @Log - void onValidateFormFromParticipantsForm() { - if (logger.isDebugEnabled()) { - logger.debug("participant saved : " + participantEdited); - } - try { - serviceFavorite.updateFavoriteParticipant(participantEdited); - } catch (PollenBusinessException eee) { -// String message = manager.getErrorMessage(eee, messages, logger); -// participantsForm.recordError(message); - manager.recordFormError(logger, messages, eee, participantsForm); - } - } - - /** - * ON_SUCCESS :: Callback method for success event of the participantsForm. - * Clean form data (participantEdited) and display a success message. {@link - * #onSubmitFromParticipantsForm()} will be called after it to refresh the - * updateZone. - */ - void onSuccessFromParticipantsForm() { - participantsFeedback.addInfo( - messages.get("pollen.ui.list.update.saveParticipant.success")); - // Clean form data before refresh zone - cleanFormData(); - } - - /** - * Clean the form content, i.e. the favorite participant in edition and its - * id. - */ - protected void cleanFormData() { - participantEditedId = null; - participantEdited = null; - } - - /** - * ON_SUBMIT :: Callback method for submit event called after succes or - * failure of the participantsForm. Will refresh the updateZone to display - * errors or Grid updated. - * - * @return the updateZone to refresh - */ - Object onSubmitFromParticipantsForm() { - return updateZone; - } - - /** ************************** NEW PARTICIPANT FORM ********************** */ - - @Property - private FavoriteParticipant newParticipant; - - @InjectComponent - private Form addParticipant; - - /** - * ON_PREPARE :: Callback method for both prepareSubmit and prepareRender - * events of the participantsForm. Will instantiate a new - * FavoriteParticipant to render or saved with form data. - * - * @see ServiceFavorite#getNewFavoriteParticipant(FavoriteList) - */ - void onPrepareFromAddParticipant() { - if (newParticipant == null) { - newParticipant = - serviceFavorite.getNewFavoriteParticipant(source); - } - } - - /** - * ON_VALIDATE_FORM :: Callback method for validateForm event of the - * addParticipant form. The newParticipant will be created using - * serviceFavorite. Errors from service will be recorded into the - * addParticipant form. - * - * @see ServiceFavorite#createFavoriteParticipant(FavoriteParticipant) - */ - void onValidateFormFromAddParticipant() { - if (logger.isDebugEnabled()) { - logger.debug("FavoriteList selected : " + source); - } - try { - serviceFavorite.createFavoriteParticipant(newParticipant); - } catch (PollenBusinessException eee) { -// String message = manager.getErrorMessage(eee, messages, logger); -// addParticipant.recordError(message); - manager.recordFormError(logger, messages, eee, participantsForm); - } - } - - /** - * ON_SUCCESS :: Callback method for success event of the addParticipant - * form. Will display a success message. {@link #onSubmitFromAddParticipant()} - * will be called after it to refresh the updateZone. - */ - void onSuccessFromAddParticipant() { - participantsFeedback.addInfo( - messages.format("pollen.ui.list.update.addParticipant.success", - newParticipant.getName())); - } - - /** - * ON_SUBMIT :: Callback method for submit event called after succes or - * failure of the addParticipant form. Will refresh the updateZone to - * display errors or Grid updated. - * - * @return the updateZone to refresh - */ - Object onSubmitFromAddParticipant() { - return updateZone; - } -} +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.components; + +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Parameter; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.corelib.components.Form; +import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.ioc.Messages; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.chorem.pollen.PollenBusinessException; +import org.chorem.pollen.entity.FavoriteList; +import org.chorem.pollen.entity.FavoriteParticipant; +import org.chorem.pollen.service.ServiceFavorite; +import org.chorem.pollen.ui.data.EvenOdd; +import org.chorem.pollen.ui.models.FavoriteParticipantDataSource; +import org.chorem.pollen.ui.services.PollenManager; +import org.nuiton.topia.framework.EntityFilter; +import org.nuiton.web.tapestry5.components.FeedBack; +import org.slf4j.Logger; + +/** + * Component to manage FavoriteParticipant in a FavoriteList as {@code source}. + * The {@code participants} are displayed in an editable Grid surrounded by an + * unique Zone {@code updateZone}. Two forms are used, one to add a new + * participant in the Grid and one to edit a participant directly in the grid. + * Each action will return the {@code updateZone} to refresh data loaded by + * {@link #getParticipants()} method. + * <p/> + * Created: 27 avr. 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$s + */ +public class UserListsUpdate { + + /** Parameters of the component * */ + @Parameter(required = true) + private FavoriteList source; + + /** Services injected * */ + @Inject + private Logger logger; + + @Inject + private ServiceFavorite serviceFavorite; + + @Inject + private PollenManager manager; + + @Inject + private Messages messages; + + /** Main properties for Grid * */ + private EvenOdd evenOdd; + + private FavoriteParticipantDataSource participants; + + @Property + private FavoriteParticipant participant; + + @InjectComponent + private Zone updateZone; + + public EvenOdd getEvenOdd() { + if (evenOdd == null) { + evenOdd = new EvenOdd(); + } + return evenOdd; + } + + public boolean canDisplayAccounts() { + return source != null; + } + + /** + * Load participants data from serviceFavorite in a {@link + * FavoriteParticipantDataSource} to manage pagination and order. The filter + * added contains data for serviceFavorite (startIndex, endIndex, orderBy + * and referenceId). The reference is set to the source FavoriteList of the + * component, i.e. all FavoriteParticipants need to be part of the + * FavoriteList source. + * + * @return the DataSource that contains participants. + */ + public FavoriteParticipantDataSource getParticipants() { + if (participants == null) { + if (logger.isDebugEnabled()) { + logger.debug("Create DATASOURCE"); + } + EntityFilter filter = manager.getNewFilter(); + filter.setReference(source); + participants = + new FavoriteParticipantDataSource(serviceFavorite, filter); + } + return participants; + } + + /***************************** EDIT PARTICIPANT FORM **********************/ + + /** + * FORM EVENTS ORDER -> RENDER : + * <p /> + * <ul> + * <li>load size of participants dataSource</li> + * <li>call prepareForRender</li> + * <li>load participants data</li> + * </ul> + * <p/> + * FORM EVENTS ORDER -> SUBMIT : + * <p /> + * <ul> + * <li>all prepareForSubmit</li> + * <li>load size of participants dataSource</li> + * <li>load participants data</li> + * <li>load participantEdited to push form data (hidden fields in first)</li> + * <li>call selected on submit button</li> + * <li>call validateForm</li> + * <li>call success or failure</li> + * <li>call submit</li> + * </ul> + */ + + @InjectComponent + private Form participantsForm; + + @InjectComponent + private FeedBack participantsFeedback; + + private FavoriteParticipant participantEdited; + + @Property + private String participantEditedId; + + /** + * Test if the edited participant is the current one in the Grid. + * + * @return true if the participantEdited is defined and correspond to the + * current participant in the Grid + */ + public boolean isEditionMode() { + // The current participant in the loop is equals to the edited one + return participantEditedId != null && + participant.getId().equals(participantEditedId); + } + + /** + * ON_ACTION :: Callback method for action on editParticipant actionLink. The + * participantEdited will be set to the participant selected in the Grid + * with {@code id}. + * + * @param id key of the participant from the Grid + * @return the updateZone content to refresh + */ + Object onActionFromEditParticipant(String id) { + if (logger.isDebugEnabled()) { + logger.debug("Participant in edition : " + id); + } + participantEditedId = id; + return updateZone.getBody(); + } + + /** + * ON_ACTION :: Callback method for action on cancelEdition actionLink. + * Simply refresh the zone will change edition mode. + * + * @return the updateZone content to refresh + */ + Object onActionFromCancelEdition() { + return updateZone.getBody(); + } + + /** + * ON_ACTION :: Callback method for action on removeParticipant actionLink. + * The selected id from the Grid will be used to delete the participant. + * + * @param id used to delete the participant + * @return the updateZone content to refresh + * @see ServiceFavorite#deleteFavoriteParticipant(String) + */ + Object onActionFromRemoveParticipant(String id) { + serviceFavorite.deleteFavoriteParticipant(id); + participantsFeedback.addInfo( + messages.get("pollen.ui.list.update.removeParticipant.success")); + return updateZone; + } + + /** + * Getter to retrieve participantEdited. <br \> The participantEditedId is + * needed and was provided for render by the {@link #onActionFromEditParticipant(String)} + * method and for submit by the hidden field in the form that keep the id + * after rendering the form. The participantEdited is loaded from the + * participants dataSource that contains all FavoriteParticipant displayed + * in the Grid. The submit will reload the participants dataSource before + * saving modification on the FavoriteParticipant edited. + * + * @return the FavoriteParticipant in edition + */ + public FavoriteParticipant getParticipantEdited() { + if (participantEdited == null && participantEditedId != null) { + if (logger.isDebugEnabled()) { + logger.debug("Load from dataSource participantEditedId : " + + participantEditedId); + } + participantEdited = participants.get(participantEditedId); + } + return participantEdited; + } + + /** + * ON_VALIDATE_FORM :: Callback method for validateForm event of the + * participantsForm. The participantEdited will be updated using + * serviceFavorite. Errors from service will be recorded into the + * participantsForm. + * + * @see ServiceFavorite#updateFavoriteParticipant(FavoriteParticipant) + */ + @Log + void onValidateFormFromParticipantsForm() { + if (logger.isDebugEnabled()) { + logger.debug("participant saved : " + participantEdited); + } + try { + serviceFavorite.updateFavoriteParticipant(participantEdited); + } catch (PollenBusinessException eee) { +// String message = manager.getErrorMessage(eee, messages, logger); +// participantsForm.recordError(message); + manager.recordFormError(logger, messages, eee, participantsForm); + } + } + + /** + * ON_SUCCESS :: Callback method for success event of the participantsForm. + * Clean form data (participantEdited) and display a success message. {@link + * #onSubmitFromParticipantsForm()} will be called after it to refresh the + * updateZone. + */ + void onSuccessFromParticipantsForm() { + participantsFeedback.addInfo( + messages.get("pollen.ui.list.update.saveParticipant.success")); + // Clean form data before refresh zone + cleanFormData(); + } + + /** + * Clean the form content, i.e. the favorite participant in edition and its + * id. + */ + protected void cleanFormData() { + participantEditedId = null; + participantEdited = null; + } + + /** + * ON_SUBMIT :: Callback method for submit event called after succes or + * failure of the participantsForm. Will refresh the updateZone to display + * errors or Grid updated. + * + * @return the updateZone to refresh + */ + Object onSubmitFromParticipantsForm() { + return updateZone; + } + + /** ************************** NEW PARTICIPANT FORM ********************** */ + + @Property + private FavoriteParticipant newParticipant; + + @InjectComponent + private Form addParticipant; + + /** + * ON_PREPARE :: Callback method for both prepareSubmit and prepareRender + * events of the participantsForm. Will instantiate a new + * FavoriteParticipant to render or saved with form data. + * + * @see ServiceFavorite#getNewFavoriteParticipant(FavoriteList) + */ + void onPrepareFromAddParticipant() { + if (newParticipant == null) { + newParticipant = + serviceFavorite.getNewFavoriteParticipant(source); + } + } + + /** + * ON_VALIDATE_FORM :: Callback method for validateForm event of the + * addParticipant form. The newParticipant will be created using + * serviceFavorite. Errors from service will be recorded into the + * addParticipant form. + * + * @see ServiceFavorite#createFavoriteParticipant(FavoriteParticipant) + */ + void onValidateFormFromAddParticipant() { + if (logger.isDebugEnabled()) { + logger.debug("FavoriteList selected : " + source); + } + try { + serviceFavorite.createFavoriteParticipant(newParticipant); + } catch (PollenBusinessException eee) { +// String message = manager.getErrorMessage(eee, messages, logger); +// addParticipant.recordError(message); + manager.recordFormError(logger, messages, eee, participantsForm); + } + } + + /** + * ON_SUCCESS :: Callback method for success event of the addParticipant + * form. Will display a success message. {@link #onSubmitFromAddParticipant()} + * will be called after it to refresh the updateZone. + */ + void onSuccessFromAddParticipant() { + participantsFeedback.addInfo( + messages.format("pollen.ui.list.update.addParticipant.success", + newParticipant.getName())); + } + + /** + * ON_SUBMIT :: Callback method for submit event called after succes or + * failure of the addParticipant form. Will refresh the updateZone to + * display errors or Grid updated. + * + * @return the updateZone to refresh + */ + Object onSubmitFromAddParticipant() { + return updateZone; + } +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Composants Tapestry utilisés dans l'application. */ -package org.chorem.pollen.ui.components; \ No newline at end of file +package org.chorem.pollen.ui.components; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBar.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBar.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBar.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBarItem.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBarItem.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/AddressBarItem.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ChoiceField.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ChoiceField.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ChoiceField.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; import org.apache.commons.fileupload.FileUploadException; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ErrorReport.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ErrorReport.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ErrorReport.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; import java.util.ArrayList; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/EvenOdd.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/EvenOdd.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/EvenOdd.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/FieldValidationException.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/FieldValidationException.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/FieldValidationException.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; import org.apache.tapestry5.ValidationException; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/GenericEncoder.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/GenericEncoder.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/GenericEncoder.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; import org.apache.tapestry5.ValueEncoder; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ParticipantsListener.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ParticipantsListener.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/ParticipantsListener.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; import java.beans.PropertyChangeEvent; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollAction.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollAction.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollAction.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -19,4 +42,4 @@ /** Énumération représentant les actions pouvant être liées à un sondage. */ public enum PollAction { CLOSE, DELETE, ADDVOTE, ADDCOMMENT, ADDCHOICE -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollHelper.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollHelper.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollHelper.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollUri.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollUri.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollUri.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollenRequiresAuthentication.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollenRequiresAuthentication.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/PollenRequiresAuthentication.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.data; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/data/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Classes de données. */ -package org.chorem.pollen.ui.data; \ No newline at end of file +package org.chorem.pollen.ui.data; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/PollenExceptionsFilter.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/PollenExceptionsFilter.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/PollenExceptionsFilter.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.filters; import java.io.IOException; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/filters/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Filtres interceptant les requêtes et les réponses d'une application Web. */ -package org.chorem.pollen.ui.filters; \ No newline at end of file +package org.chorem.pollen.ui.filters; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/FavoriteParticipantDataSource.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/FavoriteParticipantDataSource.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/FavoriteParticipantDataSource.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.models; import org.apache.tapestry5.grid.SortConstraint; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/GenericSelectModel.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/GenericSelectModel.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/GenericSelectModel.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/ParticipantListModel.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/ParticipantListModel.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/ParticipantListModel.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.models; import org.apache.tapestry5.ValueEncoder; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/PollFormModel.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.models; import org.apache.commons.lang.StringUtils; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/UserAccountDataSource.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/UserAccountDataSource.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/models/UserAccountDataSource.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.models; import org.apache.tapestry5.grid.SortConstraint; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Connection.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Connection.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Connection.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.pages; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/ErrorPage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/ErrorPage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/ErrorPage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,57 +1,80 @@ - -package org.chorem.pollen.ui.pages; - -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.ioc.Messages; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.chorem.pollen.ui.base.AbstractPollenPage; -import org.chorem.pollen.ui.components.Border; -import org.chorem.pollen.ui.data.AddressBar; -import org.chorem.pollen.ui.data.AddressBarItem; - -/** - * Error - * - * Created: 22 mars 2010 - * - * @author fdesbois - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class ErrorPage extends AbstractPollenPage { - - @InjectComponent - private Border border; - - @Inject - private Messages messages; - - private String pageName; - - @Override - public Border getBorder() { - return border; - } - - public AddressBar getAddressBar() { - return AddressBar.newBar(); - } - - void onActivate(String pageName) { - this.pageName = pageName; - } - - String onPassivate() { - return pageName; - } - - void setupRender() { - if (pageName != null) { - addError(messages.format("pollen.ui.user.display.notAllowed", - pageName)); - } - } - -} +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.pages; + +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.ioc.Messages; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.chorem.pollen.ui.base.AbstractPollenPage; +import org.chorem.pollen.ui.components.Border; +import org.chorem.pollen.ui.data.AddressBar; +import org.chorem.pollen.ui.data.AddressBarItem; + +/** + * Error + * + * Created: 22 mars 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ErrorPage extends AbstractPollenPage { + + @InjectComponent + private Border border; + + @Inject + private Messages messages; + + private String pageName; + + @Override + public Border getBorder() { + return border; + } + + public AddressBar getAddressBar() { + return AddressBar.newBar(); + } + + void onActivate(String pageName) { + this.pageName = pageName; + } + + String onPassivate() { + return pageName; + } + + void setupRender() { + if (pageName != null) { + addError(messages.format("pollen.ui.user.display.notAllowed", + pageName)); + } + } + +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Index.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Index.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/Index.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/LocalMessages.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/LocalMessages.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/LocalMessages.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminPolls.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminPolls.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminPolls.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Pages Tapestry de l'application. */ -package org.chorem.pollen.ui.pages; \ No newline at end of file +package org.chorem.pollen.ui.pages; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CloseValidation.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CloseValidation.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CloseValidation.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ConfirmPoll.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CreationValidation.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CreationValidation.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/CreationValidation.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ModificationValidation.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ModificationValidation.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/ModificationValidation.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollForm.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,762 +1,785 @@ -package org.chorem.pollen.ui.pages.poll; - -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.lang.StringUtils; -import org.apache.tapestry5.Block; -import org.apache.tapestry5.ComponentResources; -import org.apache.tapestry5.Link; -import org.apache.tapestry5.RenderSupport; -import org.apache.tapestry5.annotations.Environmental; -import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; -import org.apache.tapestry5.annotations.IncludeStylesheet; -import org.apache.tapestry5.annotations.InjectComponent; -import org.apache.tapestry5.annotations.InjectPage; -import org.apache.tapestry5.annotations.Log; -import org.apache.tapestry5.annotations.Persist; -import org.apache.tapestry5.annotations.Property; -import org.apache.tapestry5.corelib.components.Form; -import org.apache.tapestry5.corelib.components.Select; -import org.apache.tapestry5.corelib.components.Zone; -import org.apache.tapestry5.ioc.Messages; -import org.apache.tapestry5.ioc.annotations.Inject; -import org.apache.tapestry5.json.JSONObject; -import org.apache.tapestry5.services.ComponentSource; -import org.apache.tapestry5.services.PageRenderLinkSource; -import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.bean.PollenEmail; -import org.chorem.pollen.bean.PollenEmailImpl; -import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; -import org.chorem.pollen.entity.Participant; -import org.chorem.pollen.entity.ParticipantList; -import org.chorem.pollen.entity.Poll; -import org.chorem.pollen.entity.PollAccount; -import org.chorem.pollen.entity.PreventRule; -import org.chorem.pollen.entity.PreventRuleImpl; -import org.chorem.pollen.mail.PreventRuleManager; -import org.chorem.pollen.service.ServiceEmail; -import org.chorem.pollen.service.ServicePoll; -import org.chorem.pollen.ui.base.AbstractPollenPage; -import org.chorem.pollen.ui.components.Border; -import org.chorem.pollen.ui.data.AddressBar; -import org.chorem.pollen.ui.data.ChoiceField; -import org.chorem.pollen.ui.data.ErrorReport; -import org.chorem.pollen.ui.data.FieldValidationException; -import org.chorem.pollen.ui.data.PollUri; -import org.chorem.pollen.ui.models.ParticipantListModel; -import org.chorem.pollen.ui.models.PollFormModel; -import org.chorem.pollen.ui.services.PollenManager; -import org.chorem.pollen.ui.services.ServiceImage; -import org.chorem.pollen.ui.services.ServicePollUri; -import org.nuiton.web.tapestry5.components.FeedBack; -import org.slf4j.Logger; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Collection; -import java.util.Date; -import java.util.List; - -/** - * PollForm : Creation and Modification. - * <p/> - * For modification, the poll is getting from using pollUID set in url - * (activate/passivate context). - * <p/> - * This page is mostly dynamic, so all fields in the form used zoneUpdate mixin - * to refresh the form zone if necessary (for selects or some checkbox - * options). - * <p/> - * This page is composed of three parts : - * <pre> - * - Main informations : title, creator, begin and end dates, types, ... - * - Options : anonymous, addchoice, reminder, notification, ... - * - Choices of the poll (depends on type : DATE, IMAGE, TEXT). - * - Lists/Groups for pollType different from FREE. - * </pre> - * <p/> - * Created: 2 mars 2010 - * - * @author fdesbois <fdesbois(a)codelutin.com> - * @version $Id$ - */ -@IncludeStylesheet("context:css/poll.css") -@IncludeJavaScriptLibrary({"context:js/pollForm.js", "context:js/jquery-1.4.2.min.js"}) -public class PollForm extends AbstractPollenPage { - - @InjectComponent - private Border border; - - @InjectComponent - private Zone mainZone; - - @Override - public Border getBorder() { - return border; - } - - /** Services injected */ - @Inject - private Logger logger; - - @Inject - private Messages messages; - - @Inject - private ServicePoll servicePoll; - - @Inject - private PollenManager manager; - - /** Main page context */ - private String pollUID; - - /** Main page model */ - @Persist - private PollFormModel model; - - /** Main page form component */ - @InjectComponent - private Form mainForm; - - private enum PollStep { - MAIN, CHOICES; - } - - /** Current step of the Form */ - private PollStep step; - - /** - * Flag to detect an internal edition in the form. Use when submit - * actions are triggered from all buttons except the save one. - */ - private boolean edited; - - void onActivate(String id) { - pollUID = id; - } - - String onPassivate() { - return pollUID; - } - - void setupRender() { - model = null; - initOptions(); - listsFeedback.clearErrors(); - step = PollStep.MAIN; - mainForm.clearErrors(); - } - - /** - * Get the main poll used in the form. The existing poll is loaded if the - * pollUID exist. - * - * @return the current poll in edition - * @see #getModel() - */ - public Poll getPoll() { - return getModel().getPoll(); - } - - /** - * Retrieve the current model for the PollForm or create a new one. The poll - * will be initialized depends on {@code pollUID} context : the existing - * poll corresponding will be retrieve or a new one will be instantiate with - * connected user as the creator. - * - * @return the model of this page - */ - public PollFormModel getModel() { - if (model == null) { - if (logger.isDebugEnabled()) { - logger.debug("-------- NEW POLL FORM MODEL --------"); - } - model = new PollFormModel(); - try { - model.initPoll(servicePoll, pollUID, getUserConnected()); - } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); - addFatal(message); - } - } - return model; - } - - /** - * Test if the form mode is for creation : new poll. - * - * @return true if it's the create mode, false otherwise - * @throws PollenBusinessException - */ - public boolean isCreateMode() { - return getModel().isCreateMode(); - } - - /** - * Page title for border component. - * - * @return the page title depends on create or update mode. - * @throws PollenBusinessException - */ - public String getPageTitle() { - String title = ""; - if (isCreateMode()) { - title = messages.get("pageTitle-create"); - } else { - title = messages.format("pageTitle-update", getPoll().getTitle()); - } - return title; - } - - /** - * AddressBar for border component. - * - * @return the address bar. - * @throws PollenBusinessException - */ - public AddressBar getAddressBar() { - return AddressBar.newBar().appendCurrent(getPageTitle()); - } - - public Date getCurrentDate() { - return new Date(); - } - - public DateFormat getDateFormat() { - return new SimpleDateFormat(messages.get("date-pattern")); - } - - @Environmental - private RenderSupport renderSupport; - - /** - * Action when rendering form. A script is added to manage form - * interactions. - */ - @Log - void onPrepareForRender() { - String formId = mainForm.getClientId(); - if (logger.isDebugEnabled()) { - logger.debug("form id : " + formId); - } - if (formId != null) { - // Script for form interactions : see "webapp/js/pollForm.js" - renderSupport.addScript("var pollForm = " + - "new PollForm('%s', '%s', '%s', '%s');", - formId, - VoteCountingType.NORMAL, - PollType.FREE, - getUrl()); - } - } - - /** *********************** MAIN INFOS ********************************* */ - - -// @Persist -// @Property -// private boolean advancedOptions; -// -// protected void initMainInfos() { -// advancedOptions = false; -// } - - /************************** OPTIONS ***************************************/ - - /** Synchronization with anonymous and anonymousVoteAllowed options * */ - @Property - @Persist - private boolean anonymousVoteAllowedDisabled; - - /** Synchronization with continuousResults and publicResults options * */ - @Property - @Persist - private boolean publicResultsDisabled; - - /** ChoiceNb option * */ - @Property - @Persist - private boolean hasChoiceNb; - - /** Notification option * */ - @Property - @Persist - private boolean hasNotification; - - @Persist - private PreventRule notification; - - /** Reminder option * */ - @Property - @Persist - private boolean hasReminder; - - @Persist - private PreventRule reminder; - - protected void initOptions() { - anonymousVoteAllowedDisabled = false; - publicResultsDisabled = false; - hasChoiceNb = false; - hasNotification = false; - hasReminder = false; - } - - public boolean isChoiceNbDisabled() { - // voteCounting not set to NORMAL - return !getPoll().getVoteCountingType().isNormal(); - } - - - //~~~~~~~~ OPTION NOTIFICATION ~~~~~~~~~~~~// - - /** - * Get the current notification or init a new one based on PreventRule. - * - * @return the notification - */ - public PreventRule getNotification() { - if (notification == null) { - // FIXME-FD20100430 : move this in business module - notification = new PreventRuleImpl(); - notification.setScope("vote"); - notification.setSensibility(0); - notification.setRepeated(true); - notification.setMethod(PreventRuleManager.EMAIL_ACTION); - } - return notification; - } - - /** - * Condition to enable or not the notification option. - * - * @return true if the mail is not defined - * @throws PollenBusinessException - */ - public boolean isNotificationDisabled() throws PollenBusinessException { - // no email defined - return StringUtils.isEmpty(getPoll().getCreator().getEmail()); - } - - //~~~~~~~~ OPTION REMINDER ~~~~~~~~~~~~~~~~// - - /** - * Get the current reminder or init a new one based on PreventRule. - * - * @return the reminder - */ - public PreventRule getReminder() { - if (reminder == null) { - // FIXME-FD20100430 : move this in business module - reminder = new PreventRuleImpl(); - reminder.setScope("rappel"); - reminder.setSensibility(0); - reminder.setRepeated(false); - reminder.setMethod(PreventRuleManager.EMAIL_ACTION); - } - return reminder; - } - - /** - * Condition to enable or not the reminder option. - * - * @return true if the poll has a FREE pollType - * @throws PollenBusinessException - */ - public boolean isReminderDisabled() { - // pollType is FREE - return getPoll().getPollType().isFree(); - } - - /** ****************** LISTS **************************************** */ - - @Inject - private ComponentResources resources; - - @InjectComponent - private Zone listsZone; - - @InjectComponent - private FeedBack listsFeedback; - - /** Current list for loop (GROUP type) */ - @Property - private ParticipantList list; - - /** Current participant for ajaxFormLoop (GROUP or RESTRICTED) types */ - @Property - private Participant participant; - - /** Field to add a new list */ - @Property - private String listName; - - /** Flag for subForm used for lists managment */ - @Property - private boolean refreshListsZone; - - /** Flag if submit comes from lists edition */ - private boolean editLists; - - protected static final String EVENT_UPDATE_POLL_TYPE = "updatePollType"; - - /** DATA ** */ - - public ParticipantListModel getListModel() { - return getModel().getListModel(); - } - - public Collection<ParticipantList> getLists() { - return getModel().getLists(); - } - - public ParticipantList getListSelected() { - ParticipantList result = getModel().getCurrentList(); - if (logger.isDebugEnabled() && result != null) { - logger.debug("List selected : " + result.getName()); - } - return result; - } - - /** PollType change ** */ - - @Log - JSONObject onChangeFromPollType(String value) { - if (logger.isDebugEnabled()) { - logger.debug("Lists changed : " + getModel().isListsChanged()); - } - // Prepare Json response for javascript callback method - JSONObject json = new JSONObject(); - Link link = resources.createEventLink(EVENT_UPDATE_POLL_TYPE, value); - json.put("link", link.toAbsoluteURI()); - json.put("zoneId", "p-pollForm-lists-zone"); - // Add confirm message only if changed appears - if (getModel().isListsChanged()) { - // A dialog box will appeared for user confirmation on changing poll - // type with data unsaved. - json.put("confirm", - messages.get("pollen.ui.poll.form.confirmlistChange")); - } - return json; - } - - @Log - Object onUpdatePollType(String value) { - getModel().setPollType(servicePoll, manager, PollType.valueOf(value)); - return refreshListZone(); - } - - @Log - public boolean canDisplayLists() { - return getPoll().getPollType().isRestrictedOrGroup(); - } - - /** GROUPS MANAGMENT ** */ - - public String getStyleSelected() { - return isCurrentListSelected() ? " selected" : ""; - } - - public boolean isCurrentListSelected() { - return getListSelected() != null && - list.getName().equals(getListSelected().getName()); - } - - @Log - void onSelectedFromAddList() { - // Set flag for editing lists - edited = true; - // Add new list in model - getModel().addNewList(servicePoll, listName); - // Set the new list as selected one - setSelectedList(listName); - // Reset form field before refresh form - listName = null; - } - - @Log - void onSelectedFromEditList(String listName) { - // Set flag for editing lists - edited = true; - // Set the selected list - setSelectedList(listName); - } - - protected void setSelectedList(String listName) { - // Change current list, will save the previous current one - // Errors can appear during saving previous participants. - try { - getModel().setCurrentList(manager, listName); - } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); - listsFeedback.addError(message); - } - } - - @Log - Object onActionFromRemoveList() { - getModel().removeCurrentList(); - return refreshListZone(); - } - - /** PARTICIPANTS FOR LIST ** */ - - Object onAddRowFromParticipants() { - return getListModel().addNewParticipant(servicePoll, manager); - } - - void onRemoveRowFromParticipants(Participant participant) { - getListModel().removeParticipant(participant); - } - - Object refreshListZone() { - refreshListsZone = true; - return listsZone.getBody(); - } - - /** ********************** CHOICES ************************************** */ - - @Inject - private ServiceImage serviceImage; - -// @InjectComponent -// private Zone choicesZone; -// - @Inject - private Block choiceTextBlock; - - @Inject - private Block choiceDateBlock; - - @Inject - private Block choiceImageBlock; -// -// @Property -// private ChoiceField choice; -// -// @Property -// private boolean refreshChoicesZone; - - /** - * Get choices from poll if it exists or initialized 4 choices with the - * default type : TEXT. - * - * @return a list of ChoiceDTO - */ -// public List<ChoiceField> getChoices() throws PollenBusinessException { -// return getModel().getChoices(); -// } -// - public Block getChoiceTypeBlock() { - switch (getPoll().getChoiceType()) { - case DATE: - return choiceDateBlock; - case IMAGE: - return choiceImageBlock; - default: - return choiceTextBlock; - } - } - -// @Log -// Object onChangeFromChoiceType(String value) { -// ChoiceType type = ChoiceType.valueOf(value); -// getModel().setChoiceType(type); -// refreshChoicesZone = true; -// return choicesZone.getBody(); -// } - - /** ********************** NAVIGATION/SUBMISSION ************************ */ - - /** Service used to retrieve Field components from their ids */ - @Inject - private ComponentSource componentSource; - - /** Form fields used for validation */ - public static final String FORM_FIELD_BEGIN_DATE = "beginDate"; - - public static final String FORM_FIELD_END_DATE = "endDate"; - - public static final String FORM_FIELD_BEGIN_CHOICE_DATE = "beginChoiceDate"; - - public static final String FORM_FIELD_END_CHOICE_DATE = "endChoiceDate"; - - /** Resulting page after success submission */ - @InjectPage - private PollLinks pollLinks; - - /** Service to send email after success */ - @Inject - private ServiceEmail serviceEmail; - - /** Service to manage uris used in emails sent */ - @Inject - private ServicePollUri servicePollUri; - - /** - * ON_SELECTED:: Callback method for all submit actions. Will reset refreshing - * zones flags used for subForm components. - */ - @Log - void onSelected() { - refreshListsZone = false; -// refreshChoicesZone = false; - } - -// /** -// * ON_SELECTED:: Callback method for action on choiceStep submit buttons. -// * Will change the view and display the choice formFragment of the pollForm. -// * Note : maybe validations will be needed in this case (use edited flag). -// */ -// @Log -// void onSelectedFromChoiceStep(String choiceType) { -// ChoiceType type = ChoiceType.valueOf(choiceType); -// getModel().setChoiceType(type); -// step = PollStep.CHOICES; -// edited = true; -// } - - /** - * ON_SELECTED:: Callback method for action on choiceText submit button. - */ - @Log - void onSelectedFromChoiceText() { - getModel().setChoiceType(ChoiceType.TEXT); - step = PollStep.CHOICES; - edited = true; - } - - /** - * ON_SELECTED:: Callback method for action on choiceDate submit button. - */ - @Log - void onSelectedFromChoiceDate() { - getModel().setChoiceType(ChoiceType.DATE); - step = PollStep.CHOICES; - edited = true; - } - - /** - * ON_SELECTED:: Callback method for action on choiceImage submit button. - */ - @Log - void onSelectedFromChoiceImage() { - getModel().setChoiceType(ChoiceType.IMAGE); - step = PollStep.CHOICES; - edited = true; - } - - /** - * ON_SELECTED:: Callback method for action on mainStep submit button. Will - * change the view and display the main formFragment of the pollForm. - * This is a previous action after being on choices. - */ - @Log - void onSelectedFromMainStep() { - step = PollStep.MAIN; - edited = true; - } - - public boolean isChoiceStep() { - return step.equals(PollStep.CHOICES); - } - - public boolean isMainStep() { - return step.equals(PollStep.MAIN); - } - -// @Log -// Object onUploadException(FileUploadException ex) { -// addError(ex.getMessage()); -// return this; -// } - - @Log - void onValidateForm() { - if (!edited) { - // Validate data - ErrorReport report = getModel().validate(messages); - - - if (logger.isDebugEnabled()) { - for (ChoiceField choiceField : getModel().getChoices()) { - logger.debug("Choice type : " + choiceField.getChoiceType()); - logger.debug("Choice image : " + choiceField.getImage()); - logger.debug("Choice text : " + choiceField.getText()); - logger.debug("Choice date : " + choiceField.getDate()); - } - } - - - // Record errors if report is not empty - if (report.hasErrors()) { - manager.recordFormErrors(componentSource, report, mainForm); - } else { - // Execute create for business save in database - try { - getModel().create(servicePoll, serviceImage); - } catch (PollenBusinessException eee) { - manager.recordFormError(logger, messages, eee, mainForm); - } - } - } - } - - @Log - Object onSuccess() { - if (!edited) { - pollLinks.addInfo("Sauvegarde OK !"); - PollAccount creator = getPoll().getCreator(); - PollUri uri = servicePollUri.getNewPollUri(creator.getUid(), - getPoll().getUid()); - pollLinks.setPollUri(uri); - // Send an email to the creator - if (creator.getEmail() != null) { - try { - sendCreatorEmail(creator, uri); - pollLinks.addInfo(messages.get( - "pollen.ui.poll.links.creatorEmail.success")); - } catch (PollenBusinessException eee) { - String message = - manager.getErrorMessage(logger, messages, eee); - pollLinks.addError(message); - } - } else { - pollLinks.addInfo(messages.get( - "pollen.ui.poll.links.creatorEmail.notDefined")); - } - if (getPoll().getPollType().isRestrictedOrGroup()) { - pollLinks.addInfo("Les votants ont reçu un mail !"); - } - return pollLinks; - } - return mainZone; - } - - protected void sendCreatorEmail(PollAccount creator, PollUri uri) - throws PollenBusinessException { - PollenEmail email = new PollenEmailImpl(); - email.setTo(creator.getEmail()); - email.setSubject(messages.format( - "pollen.email.createPoll.subject", - getPoll().getTitle())); - - email.setContent(messages.format( - "pollen.email.createPoll.content", - getPoll().getTitle(), - servicePollUri.getVoteUrl(uri), - servicePollUri.getVoteUpdateUrl(uri), - servicePollUri.getPollUpdateUrl(uri))); - - serviceEmail.sendEmail(email); - } - - @Log - Object onFailure() { - return mainZone; - } - - -} +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.pages.poll; + +import org.apache.commons.fileupload.FileUploadException; +import org.apache.commons.lang.StringUtils; +import org.apache.tapestry5.Block; +import org.apache.tapestry5.ComponentResources; +import org.apache.tapestry5.Link; +import org.apache.tapestry5.RenderSupport; +import org.apache.tapestry5.annotations.Environmental; +import org.apache.tapestry5.annotations.IncludeJavaScriptLibrary; +import org.apache.tapestry5.annotations.IncludeStylesheet; +import org.apache.tapestry5.annotations.InjectComponent; +import org.apache.tapestry5.annotations.InjectPage; +import org.apache.tapestry5.annotations.Log; +import org.apache.tapestry5.annotations.Persist; +import org.apache.tapestry5.annotations.Property; +import org.apache.tapestry5.corelib.components.Form; +import org.apache.tapestry5.corelib.components.Select; +import org.apache.tapestry5.corelib.components.Zone; +import org.apache.tapestry5.ioc.Messages; +import org.apache.tapestry5.ioc.annotations.Inject; +import org.apache.tapestry5.json.JSONObject; +import org.apache.tapestry5.services.ComponentSource; +import org.apache.tapestry5.services.PageRenderLinkSource; +import org.chorem.pollen.PollenBusinessException; +import org.chorem.pollen.bean.PollenEmail; +import org.chorem.pollen.bean.PollenEmailImpl; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; +import org.chorem.pollen.entity.Participant; +import org.chorem.pollen.entity.ParticipantList; +import org.chorem.pollen.entity.Poll; +import org.chorem.pollen.entity.PollAccount; +import org.chorem.pollen.entity.PreventRule; +import org.chorem.pollen.entity.PreventRuleImpl; +import org.chorem.pollen.mail.PreventRuleManager; +import org.chorem.pollen.service.ServiceEmail; +import org.chorem.pollen.service.ServicePoll; +import org.chorem.pollen.ui.base.AbstractPollenPage; +import org.chorem.pollen.ui.components.Border; +import org.chorem.pollen.ui.data.AddressBar; +import org.chorem.pollen.ui.data.ChoiceField; +import org.chorem.pollen.ui.data.ErrorReport; +import org.chorem.pollen.ui.data.FieldValidationException; +import org.chorem.pollen.ui.data.PollUri; +import org.chorem.pollen.ui.models.ParticipantListModel; +import org.chorem.pollen.ui.models.PollFormModel; +import org.chorem.pollen.ui.services.PollenManager; +import org.chorem.pollen.ui.services.ServiceImage; +import org.chorem.pollen.ui.services.ServicePollUri; +import org.nuiton.web.tapestry5.components.FeedBack; +import org.slf4j.Logger; + +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Collection; +import java.util.Date; +import java.util.List; + +/** + * PollForm : Creation and Modification. + * <p/> + * For modification, the poll is getting from using pollUID set in url + * (activate/passivate context). + * <p/> + * This page is mostly dynamic, so all fields in the form used zoneUpdate mixin + * to refresh the form zone if necessary (for selects or some checkbox + * options). + * <p/> + * This page is composed of three parts : + * <pre> + * - Main informations : title, creator, begin and end dates, types, ... + * - Options : anonymous, addchoice, reminder, notification, ... + * - Choices of the poll (depends on type : DATE, IMAGE, TEXT). + * - Lists/Groups for pollType different from FREE. + * </pre> + * <p/> + * Created: 2 mars 2010 + * + * @author fdesbois <fdesbois(a)codelutin.com> + * @version $Id$ + */ +@IncludeStylesheet("context:css/poll.css") +@IncludeJavaScriptLibrary({"context:js/pollForm.js", "context:js/jquery-1.4.2.min.js"}) +public class PollForm extends AbstractPollenPage { + + @InjectComponent + private Border border; + + @InjectComponent + private Zone mainZone; + + @Override + public Border getBorder() { + return border; + } + + /** Services injected */ + @Inject + private Logger logger; + + @Inject + private Messages messages; + + @Inject + private ServicePoll servicePoll; + + @Inject + private PollenManager manager; + + /** Main page context */ + private String pollUID; + + /** Main page model */ + @Persist + private PollFormModel model; + + /** Main page form component */ + @InjectComponent + private Form mainForm; + + private enum PollStep { + MAIN, CHOICES; + } + + /** Current step of the Form */ + private PollStep step; + + /** + * Flag to detect an internal edition in the form. Use when submit + * actions are triggered from all buttons except the save one. + */ + private boolean edited; + + void onActivate(String id) { + pollUID = id; + } + + String onPassivate() { + return pollUID; + } + + void setupRender() { + model = null; + initOptions(); + listsFeedback.clearErrors(); + step = PollStep.MAIN; + mainForm.clearErrors(); + } + + /** + * Get the main poll used in the form. The existing poll is loaded if the + * pollUID exist. + * + * @return the current poll in edition + * @see #getModel() + */ + public Poll getPoll() { + return getModel().getPoll(); + } + + /** + * Retrieve the current model for the PollForm or create a new one. The poll + * will be initialized depends on {@code pollUID} context : the existing + * poll corresponding will be retrieve or a new one will be instantiate with + * connected user as the creator. + * + * @return the model of this page + */ + public PollFormModel getModel() { + if (model == null) { + if (logger.isDebugEnabled()) { + logger.debug("-------- NEW POLL FORM MODEL --------"); + } + model = new PollFormModel(); + try { + model.initPoll(servicePoll, pollUID, getUserConnected()); + } catch (PollenBusinessException eee) { + String message = manager.getErrorMessage(logger, messages, eee); + addFatal(message); + } + } + return model; + } + + /** + * Test if the form mode is for creation : new poll. + * + * @return true if it's the create mode, false otherwise + * @throws PollenBusinessException + */ + public boolean isCreateMode() { + return getModel().isCreateMode(); + } + + /** + * Page title for border component. + * + * @return the page title depends on create or update mode. + * @throws PollenBusinessException + */ + public String getPageTitle() { + String title = ""; + if (isCreateMode()) { + title = messages.get("pageTitle-create"); + } else { + title = messages.format("pageTitle-update", getPoll().getTitle()); + } + return title; + } + + /** + * AddressBar for border component. + * + * @return the address bar. + * @throws PollenBusinessException + */ + public AddressBar getAddressBar() { + return AddressBar.newBar().appendCurrent(getPageTitle()); + } + + public Date getCurrentDate() { + return new Date(); + } + + public DateFormat getDateFormat() { + return new SimpleDateFormat(messages.get("date-pattern")); + } + + @Environmental + private RenderSupport renderSupport; + + /** + * Action when rendering form. A script is added to manage form + * interactions. + */ + @Log + void onPrepareForRender() { + String formId = mainForm.getClientId(); + if (logger.isDebugEnabled()) { + logger.debug("form id : " + formId); + } + if (formId != null) { + // Script for form interactions : see "webapp/js/pollForm.js" + renderSupport.addScript("var pollForm = " + + "new PollForm('%s', '%s', '%s', '%s');", + formId, + VoteCountingType.NORMAL, + PollType.FREE, + getUrl()); + } + } + + /** *********************** MAIN INFOS ********************************* */ + + +// @Persist +// @Property +// private boolean advancedOptions; +// +// protected void initMainInfos() { +// advancedOptions = false; +// } + + /************************** OPTIONS ***************************************/ + + /** Synchronization with anonymous and anonymousVoteAllowed options * */ + @Property + @Persist + private boolean anonymousVoteAllowedDisabled; + + /** Synchronization with continuousResults and publicResults options * */ + @Property + @Persist + private boolean publicResultsDisabled; + + /** ChoiceNb option * */ + @Property + @Persist + private boolean hasChoiceNb; + + /** Notification option * */ + @Property + @Persist + private boolean hasNotification; + + @Persist + private PreventRule notification; + + /** Reminder option * */ + @Property + @Persist + private boolean hasReminder; + + @Persist + private PreventRule reminder; + + protected void initOptions() { + anonymousVoteAllowedDisabled = false; + publicResultsDisabled = false; + hasChoiceNb = false; + hasNotification = false; + hasReminder = false; + } + + public boolean isChoiceNbDisabled() { + // voteCounting not set to NORMAL + return !getPoll().getVoteCountingType().isNormal(); + } + + + //~~~~~~~~ OPTION NOTIFICATION ~~~~~~~~~~~~// + + /** + * Get the current notification or init a new one based on PreventRule. + * + * @return the notification + */ + public PreventRule getNotification() { + if (notification == null) { + // FIXME-FD20100430 : move this in business module + notification = new PreventRuleImpl(); + notification.setScope("vote"); + notification.setSensibility(0); + notification.setRepeated(true); + notification.setMethod(PreventRuleManager.EMAIL_ACTION); + } + return notification; + } + + /** + * Condition to enable or not the notification option. + * + * @return true if the mail is not defined + * @throws PollenBusinessException + */ + public boolean isNotificationDisabled() throws PollenBusinessException { + // no email defined + return StringUtils.isEmpty(getPoll().getCreator().getEmail()); + } + + //~~~~~~~~ OPTION REMINDER ~~~~~~~~~~~~~~~~// + + /** + * Get the current reminder or init a new one based on PreventRule. + * + * @return the reminder + */ + public PreventRule getReminder() { + if (reminder == null) { + // FIXME-FD20100430 : move this in business module + reminder = new PreventRuleImpl(); + reminder.setScope("rappel"); + reminder.setSensibility(0); + reminder.setRepeated(false); + reminder.setMethod(PreventRuleManager.EMAIL_ACTION); + } + return reminder; + } + + /** + * Condition to enable or not the reminder option. + * + * @return true if the poll has a FREE pollType + * @throws PollenBusinessException + */ + public boolean isReminderDisabled() { + // pollType is FREE + return getPoll().getPollType().isFree(); + } + + /** ****************** LISTS **************************************** */ + + @Inject + private ComponentResources resources; + + @InjectComponent + private Zone listsZone; + + @InjectComponent + private FeedBack listsFeedback; + + /** Current list for loop (GROUP type) */ + @Property + private ParticipantList list; + + /** Current participant for ajaxFormLoop (GROUP or RESTRICTED) types */ + @Property + private Participant participant; + + /** Field to add a new list */ + @Property + private String listName; + + /** Flag for subForm used for lists managment */ + @Property + private boolean refreshListsZone; + + /** Flag if submit comes from lists edition */ + private boolean editLists; + + protected static final String EVENT_UPDATE_POLL_TYPE = "updatePollType"; + + /** DATA ** */ + + public ParticipantListModel getListModel() { + return getModel().getListModel(); + } + + public Collection<ParticipantList> getLists() { + return getModel().getLists(); + } + + public ParticipantList getListSelected() { + ParticipantList result = getModel().getCurrentList(); + if (logger.isDebugEnabled() && result != null) { + logger.debug("List selected : " + result.getName()); + } + return result; + } + + /** PollType change ** */ + + @Log + JSONObject onChangeFromPollType(String value) { + if (logger.isDebugEnabled()) { + logger.debug("Lists changed : " + getModel().isListsChanged()); + } + // Prepare Json response for javascript callback method + JSONObject json = new JSONObject(); + Link link = resources.createEventLink(EVENT_UPDATE_POLL_TYPE, value); + json.put("link", link.toAbsoluteURI()); + json.put("zoneId", "p-pollForm-lists-zone"); + // Add confirm message only if changed appears + if (getModel().isListsChanged()) { + // A dialog box will appeared for user confirmation on changing poll + // type with data unsaved. + json.put("confirm", + messages.get("pollen.ui.poll.form.confirmlistChange")); + } + return json; + } + + @Log + Object onUpdatePollType(String value) { + getModel().setPollType(servicePoll, manager, PollType.valueOf(value)); + return refreshListZone(); + } + + @Log + public boolean canDisplayLists() { + return getPoll().getPollType().isRestrictedOrGroup(); + } + + /** GROUPS MANAGMENT ** */ + + public String getStyleSelected() { + return isCurrentListSelected() ? " selected" : ""; + } + + public boolean isCurrentListSelected() { + return getListSelected() != null && + list.getName().equals(getListSelected().getName()); + } + + @Log + void onSelectedFromAddList() { + // Set flag for editing lists + edited = true; + // Add new list in model + getModel().addNewList(servicePoll, listName); + // Set the new list as selected one + setSelectedList(listName); + // Reset form field before refresh form + listName = null; + } + + @Log + void onSelectedFromEditList(String listName) { + // Set flag for editing lists + edited = true; + // Set the selected list + setSelectedList(listName); + } + + protected void setSelectedList(String listName) { + // Change current list, will save the previous current one + // Errors can appear during saving previous participants. + try { + getModel().setCurrentList(manager, listName); + } catch (PollenBusinessException eee) { + String message = manager.getErrorMessage(logger, messages, eee); + listsFeedback.addError(message); + } + } + + @Log + Object onActionFromRemoveList() { + getModel().removeCurrentList(); + return refreshListZone(); + } + + /** PARTICIPANTS FOR LIST ** */ + + Object onAddRowFromParticipants() { + return getListModel().addNewParticipant(servicePoll, manager); + } + + void onRemoveRowFromParticipants(Participant participant) { + getListModel().removeParticipant(participant); + } + + Object refreshListZone() { + refreshListsZone = true; + return listsZone.getBody(); + } + + /** ********************** CHOICES ************************************** */ + + @Inject + private ServiceImage serviceImage; + +// @InjectComponent +// private Zone choicesZone; +// + @Inject + private Block choiceTextBlock; + + @Inject + private Block choiceDateBlock; + + @Inject + private Block choiceImageBlock; +// +// @Property +// private ChoiceField choice; +// +// @Property +// private boolean refreshChoicesZone; + + /** + * Get choices from poll if it exists or initialized 4 choices with the + * default type : TEXT. + * + * @return a list of ChoiceDTO + */ +// public List<ChoiceField> getChoices() throws PollenBusinessException { +// return getModel().getChoices(); +// } +// + public Block getChoiceTypeBlock() { + switch (getPoll().getChoiceType()) { + case DATE: + return choiceDateBlock; + case IMAGE: + return choiceImageBlock; + default: + return choiceTextBlock; + } + } + +// @Log +// Object onChangeFromChoiceType(String value) { +// ChoiceType type = ChoiceType.valueOf(value); +// getModel().setChoiceType(type); +// refreshChoicesZone = true; +// return choicesZone.getBody(); +// } + + /** ********************** NAVIGATION/SUBMISSION ************************ */ + + /** Service used to retrieve Field components from their ids */ + @Inject + private ComponentSource componentSource; + + /** Form fields used for validation */ + public static final String FORM_FIELD_BEGIN_DATE = "beginDate"; + + public static final String FORM_FIELD_END_DATE = "endDate"; + + public static final String FORM_FIELD_BEGIN_CHOICE_DATE = "beginChoiceDate"; + + public static final String FORM_FIELD_END_CHOICE_DATE = "endChoiceDate"; + + /** Resulting page after success submission */ + @InjectPage + private PollLinks pollLinks; + + /** Service to send email after success */ + @Inject + private ServiceEmail serviceEmail; + + /** Service to manage uris used in emails sent */ + @Inject + private ServicePollUri servicePollUri; + + /** + * ON_SELECTED:: Callback method for all submit actions. Will reset refreshing + * zones flags used for subForm components. + */ + @Log + void onSelected() { + refreshListsZone = false; +// refreshChoicesZone = false; + } + +// /** +// * ON_SELECTED:: Callback method for action on choiceStep submit buttons. +// * Will change the view and display the choice formFragment of the pollForm. +// * Note : maybe validations will be needed in this case (use edited flag). +// */ +// @Log +// void onSelectedFromChoiceStep(String choiceType) { +// ChoiceType type = ChoiceType.valueOf(choiceType); +// getModel().setChoiceType(type); +// step = PollStep.CHOICES; +// edited = true; +// } + + /** + * ON_SELECTED:: Callback method for action on choiceText submit button. + */ + @Log + void onSelectedFromChoiceText() { + getModel().setChoiceType(ChoiceType.TEXT); + step = PollStep.CHOICES; + edited = true; + } + + /** + * ON_SELECTED:: Callback method for action on choiceDate submit button. + */ + @Log + void onSelectedFromChoiceDate() { + getModel().setChoiceType(ChoiceType.DATE); + step = PollStep.CHOICES; + edited = true; + } + + /** + * ON_SELECTED:: Callback method for action on choiceImage submit button. + */ + @Log + void onSelectedFromChoiceImage() { + getModel().setChoiceType(ChoiceType.IMAGE); + step = PollStep.CHOICES; + edited = true; + } + + /** + * ON_SELECTED:: Callback method for action on mainStep submit button. Will + * change the view and display the main formFragment of the pollForm. + * This is a previous action after being on choices. + */ + @Log + void onSelectedFromMainStep() { + step = PollStep.MAIN; + edited = true; + } + + public boolean isChoiceStep() { + return step.equals(PollStep.CHOICES); + } + + public boolean isMainStep() { + return step.equals(PollStep.MAIN); + } + +// @Log +// Object onUploadException(FileUploadException ex) { +// addError(ex.getMessage()); +// return this; +// } + + @Log + void onValidateForm() { + if (!edited) { + // Validate data + ErrorReport report = getModel().validate(messages); + + + if (logger.isDebugEnabled()) { + for (ChoiceField choiceField : getModel().getChoices()) { + logger.debug("Choice type : " + choiceField.getChoiceType()); + logger.debug("Choice image : " + choiceField.getImage()); + logger.debug("Choice text : " + choiceField.getText()); + logger.debug("Choice date : " + choiceField.getDate()); + } + } + + + // Record errors if report is not empty + if (report.hasErrors()) { + manager.recordFormErrors(componentSource, report, mainForm); + } else { + // Execute create for business save in database + try { + getModel().create(servicePoll, serviceImage); + } catch (PollenBusinessException eee) { + manager.recordFormError(logger, messages, eee, mainForm); + } + } + } + } + + @Log + Object onSuccess() { + if (!edited) { + pollLinks.addInfo("Sauvegarde OK !"); + PollAccount creator = getPoll().getCreator(); + PollUri uri = servicePollUri.getNewPollUri(creator.getUid(), + getPoll().getUid()); + pollLinks.setPollUri(uri); + // Send an email to the creator + if (creator.getEmail() != null) { + try { + sendCreatorEmail(creator, uri); + pollLinks.addInfo(messages.get( + "pollen.ui.poll.links.creatorEmail.success")); + } catch (PollenBusinessException eee) { + String message = + manager.getErrorMessage(logger, messages, eee); + pollLinks.addError(message); + } + } else { + pollLinks.addInfo(messages.get( + "pollen.ui.poll.links.creatorEmail.notDefined")); + } + if (getPoll().getPollType().isRestrictedOrGroup()) { + pollLinks.addInfo("Les votants ont reçu un mail !"); + } + return pollLinks; + } + return mainZone; + } + + protected void sendCreatorEmail(PollAccount creator, PollUri uri) + throws PollenBusinessException { + PollenEmail email = new PollenEmailImpl(); + email.setTo(creator.getEmail()); + email.setSubject(messages.format( + "pollen.email.createPoll.subject", + getPoll().getTitle())); + + email.setContent(messages.format( + "pollen.email.createPoll.content", + getPoll().getTitle(), + servicePollUri.getVoteUrl(uri), + servicePollUri.getVoteUpdateUrl(uri), + servicePollUri.getPollUpdateUrl(uri))); + + serviceEmail.sendEmail(email); + } + + @Log + Object onFailure() { + return mainZone; + } + + +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollLinks.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollLinks.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollLinks.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.pages.poll; import org.apache.tapestry5.Link; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/Results.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/VoteForPoll.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserLists.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserLists.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserLists.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -163,4 +186,4 @@ messages.get("pollen.ui.list.delete.success")); } } -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsCreated.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsCreated.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsCreated.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsParticipated.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsParticipated.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserPollsParticipated.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserProfile.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserProfile.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserProfile.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserRegister.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserRegister.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/user/UserRegister.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/AppModule.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthentication.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthentication.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthentication.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.services; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthenticationFilter.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthenticationFilter.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenAuthenticationFilter.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.services; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenManager.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenManager.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/PollenManager.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ /* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ +/* * *##% * Wao :: Web Interface * Copyright (C) 2009 - 2010 Ifremer Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImage.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImage.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImage.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.services; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImageImpl.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImageImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServiceImageImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.services; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUri.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUri.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUri.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.services; import org.apache.tapestry5.Link; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUriImpl.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUriImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/ServicePollUriImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.services; import org.apache.tapestry5.Link; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Gestion des services pour Tapestry. */ -package org.chorem.pollen.ui.services; \ No newline at end of file +package org.chorem.pollen.ui.services; Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVAccountUtil.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVAccountUtil.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/CSVAccountUtil.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/FeedUtil.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/FeedUtil.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/FeedUtil.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/LDAPAccountUtil.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/LDAPAccountUtil.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/LDAPAccountUtil.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/UnitConverter.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/UnitConverter.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/UnitConverter.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/package-info.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/utils/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Classes utilitaires. */ -package org.chorem.pollen.ui.utils; \ No newline at end of file +package org.chorem.pollen.ui.utils; Modified: trunk/pollen-ui/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui/src/main/resources/log4j.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/log4j.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### # Default to info level output; this is very handy if you eventually use Hibernate as well. log4j.rootCategory=warn, A1, globalfile Modified: trunk/pollen-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/apache/tapestry5/corelib/components/Errors_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1 +1,24 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### default-banner=Vous devez corriger ces erreurs avant de poursuivre. Modified: trunk/pollen-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/apache/tapestry5/internal/ValidationMessages_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### required=Le champs %s est requis. minimum-string-length=Le champs %2$s doit contenir plus de %1$d caract\u00E8res. maximum-string-length=Le champs %2$s est limit\u00E9 \u00E0 %1$d caract\u00E8res. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #functions vote=Vote vote-help=Vote for poll. @@ -24,4 +47,4 @@ beginChoiceDate-label=Adding choices beginDate-label=Begin endDate-label=End -functions-label=Functions \ No newline at end of file +functions-label=Functions Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/base/Polls_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #functions vote=Voter vote-help=Voir le sondage. @@ -24,4 +47,4 @@ beginChoiceDate-label=Ajout de choix beginDate-label=D\u00E9but endDate-label=Fin -functions-label=Fonctions \ No newline at end of file +functions-label=Fonctions Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #head header-contact-title=Send a mail to an administrator @@ -33,4 +56,4 @@ footer-documentation-url=http://maven-site.chorem.org/pollen/ footer-license=GPL footer-bugReport=Bug report -footer-userSupport=User support \ No newline at end of file +footer-userSupport=User support Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #head header-contact-title=Contacter un administrateur @@ -33,4 +56,4 @@ footer-documentation-url=http://maven-site.chorem.org/pollen/fr footer-license=Licence GPL footer-bugReport=Rapport de bug -footer-userSupport=Support utilisateur \ No newline at end of file +footer-userSupport=Support utilisateur Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceDateForm.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceDateForm.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceDateForm.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" @@ -28,4 +51,4 @@ </div> </fieldset> </div> -</body> \ No newline at end of file +</body> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceImageForm.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceImageForm.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceImageForm.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" @@ -26,4 +49,4 @@ </div> </fieldset> </div> -</body> \ No newline at end of file +</body> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceTextForm.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceTextForm.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/ChoiceTextForm.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" @@ -25,4 +48,4 @@ </div> </fieldset> </div> -</body> \ No newline at end of file +</body> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Image.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Image.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Image.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <a xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" rel="lightbox[pollChoiceImages]" href="${imageLink}" title="${alt}"> <img src="${thumbLink}" alt="${alt}" /> -</a> \ No newline at end of file +</a> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### page=Page %d/%d go-to=Go to page %d rows-title=Rows %d - %d over %d @@ -2,2 +25,2 @@ showPerPage=Show on each page: -change-nbrows=Change to %d rows per page \ No newline at end of file +change-nbrows=Change to %d rows per page Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Pager_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### page=Page %d/%d go-to=Aller \u00E0 la page %d rows-title=Lignes %d - %d sur %d Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/SubForm.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/SubForm.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/SubForm.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -11,4 +34,4 @@ <t:body /> </t:block> -</html> \ No newline at end of file +</html> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsCreate.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsCreate.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsCreate.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,32 +1,55 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - <t:zone t:id="createZone" t:update="show"> - <form t:type="form" class="createList" t:id="createList" action="tapestry" t:zone="createZone"> - <t:errors/> - <fieldset class="create"> - <legend>${message:pollen.ui.list.create.title}</legend> - <div> - <label t:type="label" for="listName" />* : - <input t:type="textfield" t:id="listName" value="newFavoriteList.name" t:validate="required"/> - </div> -  - <div class="buttons"> - <input t:type="submit" value="${message:pollen.ui.button.create}"/> - </div> - </fieldset> - </form> - </t:zone> -</body> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + <t:zone t:id="createZone" t:update="show"> + <form t:type="form" class="createList" t:id="createList" action="tapestry" t:zone="createZone"> + <t:errors/> + <fieldset class="create"> + <legend>${message:pollen.ui.list.create.title}</legend> + <div> + <label t:type="label" for="listName" />* : + <input t:type="textfield" t:id="listName" value="newFavoriteList.name" t:validate="required"/> + </div> +  + <div class="buttons"> + <input t:type="submit" value="${message:pollen.ui.button.create}"/> + </div> + </fieldset> + </form> + </t:zone> +</body> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/UserListsUpdate.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,90 +1,113 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - - <t:if test="canDisplayAccounts()"> - <div t:type="zone" class="updateZone" t:id="updateZone" t:update="show"> - <p class="center"> - <t:if t:test="participants.availableRows"> - ${format:pollen.ui.list.nbParticipants=participants.availableRows} - <p:else> - ${message:pollen.ui.list.emptyList} - </p:else> - </t:if> - </p> - <form t:type="form" t:id="participantsForm" action="tapestry" t:zone="updateZone"> - <t:errors /> - <p><input t:type="hidden" value="participantEditedId" /></p> -  - <div t:type="grid" t:source="participants" t:row="participant" - t:include="name, email, weight" t:add="actions" - t:rowsPerPage="10" t:rowClass="prop:evenodd.next" t:inPlace="true"> - <p:nameCell> - <t:if t:test="editionMode"> - <input t:type="textfield" t:id="editName" value="participantEdited.name" t:validate="required" size="10" /> - <p:else>${participant.name}</p:else> - </t:if> - </p:nameCell> - <p:emailCell> - <t:if t:test="editionMode"> - <input t:type="textfield" t:id="editEmail" value="participantEdited.email" t:validate="required,regexp" size="15" /> - <p:else>${participant.email}</p:else> - </t:if> - </p:emailCell> - <p:weightCell> - <t:if t:test="editionMode"> - <input t:type="textfield" t:id="editWeight" value="participantEdited.weight" t:validate="required" size="1" /> - <p:else>${participant.weight}</p:else> - </t:if> - </p:weightCell> - <p:actionsCell> - <t:if t:test="editionMode"> - <a t:type="actionlink" t:id="cancelEdition" title="${message:pollen.ui.list.update.cancelEdition}" t:zone="updateZone"> - <img src="${asset:context:img/undo.png}" alt="${message:pollen.ui.list.update.cancelEdition}" /> - </a>  - <input t:type="submit" t:id="saveParticipant" t:image="context:img/save.png" value="Save" - title="${message:pollen.ui.list.update.saveParticipant}" /> - <p:else> - <a t:type="actionlink" t:id="editParticipant" t:context="participant.id" t:zone="updateZone" - title="${message:pollen.ui.list.update.updateParticipant}"> - <img src="${asset:context:img/editSmall.png}" alt="${message:pollen.ui.list.update.updateParticipant}" /> - </a>  - <a t:type="actionlink" t:id="removeParticipant" t:context="participant.id" t:zone="updateZone" - title="${message:pollen.ui.list.update.removeParticipant}" - t:mixins="nuiton/confirm" t:message="format:pollen.ui.list.update.removeParticipant.confirmMessage=participant.name"> - <img src="${asset:context:img/delete.png}" alt="${message:pollen.ui.list.update.removeParticipant}" /> - </a> - </p:else> - </t:if> - </p:actionsCell> - <p:empty /> - </div> - </form> - - <div t:type="nuiton/feedback" t:id="participantsFeedback" /> - -  - <form t:type="form" class="addParticipant" t:id="addParticipant" t:zone="updateZone" action="tapestry"> - <fieldset class="create"> - <legend>${message:pollen.ui.list.update.addParticipant}</legend> - <t:errors/> - <div> - <label t:type="label" for="name" />* : - <input t:type="textfield" t:id="name" t:value="newParticipant.name" t:validate="required" size="10"/>  - <label t:type="label" for="email" /> : - <input t:type="textfield" t:id="email" t:value="newParticipant.email" t:validate="regexp" size="15"/>  - <label t:type="label" for="weight" /> : - <input t:type="textfield" t:id="weight" t:value="newParticipant.weight" t:validate="required" size="1"/> - <span t:type="ck/Tooltip" t:title="message:pollen.ui.tooltip.help" t:value="message:pollen.ui.list.create.weightHelp" t:effect="appear"> - <img src="${asset:context:img/help.png}" alt="${message:pollen.ui.tooltip.help}"/> - </span>  - <input t:type="submit" value="${message:pollen.ui.button.add}" title="${message:pollen.ui.list.update.addParticipant}"/> - </div> - </fieldset> - </form> - </div> - - <p:else> - <p class="center">${message:pollen.ui.list.notSelected}</p> - </p:else> - </t:if> -</body> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<body xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + + <t:if test="canDisplayAccounts()"> + <div t:type="zone" class="updateZone" t:id="updateZone" t:update="show"> + <p class="center"> + <t:if t:test="participants.availableRows"> + ${format:pollen.ui.list.nbParticipants=participants.availableRows} + <p:else> + ${message:pollen.ui.list.emptyList} + </p:else> + </t:if> + </p> + <form t:type="form" t:id="participantsForm" action="tapestry" t:zone="updateZone"> + <t:errors /> + <p><input t:type="hidden" value="participantEditedId" /></p> +  + <div t:type="grid" t:source="participants" t:row="participant" + t:include="name, email, weight" t:add="actions" + t:rowsPerPage="10" t:rowClass="prop:evenodd.next" t:inPlace="true"> + <p:nameCell> + <t:if t:test="editionMode"> + <input t:type="textfield" t:id="editName" value="participantEdited.name" t:validate="required" size="10" /> + <p:else>${participant.name}</p:else> + </t:if> + </p:nameCell> + <p:emailCell> + <t:if t:test="editionMode"> + <input t:type="textfield" t:id="editEmail" value="participantEdited.email" t:validate="required,regexp" size="15" /> + <p:else>${participant.email}</p:else> + </t:if> + </p:emailCell> + <p:weightCell> + <t:if t:test="editionMode"> + <input t:type="textfield" t:id="editWeight" value="participantEdited.weight" t:validate="required" size="1" /> + <p:else>${participant.weight}</p:else> + </t:if> + </p:weightCell> + <p:actionsCell> + <t:if t:test="editionMode"> + <a t:type="actionlink" t:id="cancelEdition" title="${message:pollen.ui.list.update.cancelEdition}" t:zone="updateZone"> + <img src="${asset:context:img/undo.png}" alt="${message:pollen.ui.list.update.cancelEdition}" /> + </a>  + <input t:type="submit" t:id="saveParticipant" t:image="context:img/save.png" value="Save" + title="${message:pollen.ui.list.update.saveParticipant}" /> + <p:else> + <a t:type="actionlink" t:id="editParticipant" t:context="participant.id" t:zone="updateZone" + title="${message:pollen.ui.list.update.updateParticipant}"> + <img src="${asset:context:img/editSmall.png}" alt="${message:pollen.ui.list.update.updateParticipant}" /> + </a>  + <a t:type="actionlink" t:id="removeParticipant" t:context="participant.id" t:zone="updateZone" + title="${message:pollen.ui.list.update.removeParticipant}" + t:mixins="nuiton/confirm" t:message="format:pollen.ui.list.update.removeParticipant.confirmMessage=participant.name"> + <img src="${asset:context:img/delete.png}" alt="${message:pollen.ui.list.update.removeParticipant}" /> + </a> + </p:else> + </t:if> + </p:actionsCell> + <p:empty /> + </div> + </form> + + <div t:type="nuiton/feedback" t:id="participantsFeedback" /> + +  + <form t:type="form" class="addParticipant" t:id="addParticipant" t:zone="updateZone" action="tapestry"> + <fieldset class="create"> + <legend>${message:pollen.ui.list.update.addParticipant}</legend> + <t:errors/> + <div> + <label t:type="label" for="name" />* : + <input t:type="textfield" t:id="name" t:value="newParticipant.name" t:validate="required" size="10"/>  + <label t:type="label" for="email" /> : + <input t:type="textfield" t:id="email" t:value="newParticipant.email" t:validate="regexp" size="15"/>  + <label t:type="label" for="weight" /> : + <input t:type="textfield" t:id="weight" t:value="newParticipant.weight" t:validate="required" size="1"/> + <span t:type="ck/Tooltip" t:title="message:pollen.ui.tooltip.help" t:value="message:pollen.ui.list.create.weightHelp" t:effect="appear"> + <img src="${asset:context:img/help.png}" alt="${message:pollen.ui.tooltip.help}"/> + </span>  + <input t:type="submit" value="${message:pollen.ui.button.add}" title="${message:pollen.ui.list.update.addParticipant}"/> + </div> + </fieldset> + </form> + </div> + + <p:else> + <p class="center">${message:pollen.ui.list.notSelected}</p> + </p:else> + </t:if> +</body> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Polls administration noUser=You must be logged to access polls administration.\n Please fill the form below. userNotAllowed=You are not allowed to access this page. -noPolls=No poll exists. \ No newline at end of file +noPolls=No poll exists. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminPolls_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Gestion des sondages noUser=Vous devez \u00EAtre identifi\u00E9 pour pouvoir administrer les sondages.\n Veuillez remplir le formulaire ci-dessous. userNotAllowed=Vous n'\u00EAtes pas autoris\u00E9 \u00E0 acc\u00E9der \u00E0 cette page. -noPolls=Aucun sondage existant. \ No newline at end of file +noPolls=Aucun sondage existant. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Users administration noUser=You must be logged to access users administration.\n Please fill the form below. userNotAllowed=You are not allowed to access this page. @@ -20,4 +43,4 @@ login-required-message=You must provide a username. email-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ -email-regexp-message=Invalid email. \ No newline at end of file +email-regexp-message=Invalid email. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/admin/AdminUsers_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #title=Gestion des utilisateurs @@ -30,4 +53,4 @@ email-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ email-regexp-message=Email invalide newEmail-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ -newEmail-regexp-message=Email invalide \ No newline at end of file +newEmail-regexp-message=Email invalide Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Poll closing by=by closed=Poll closed @@ -4,4 +27,4 @@ count=Count countPage=The link below leads to the page to count the votes. Save it to be able to count the vote later : register=If you are a logged user, you can find this link on the page -myPolls=My polls \ No newline at end of file +myPolls=My polls Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CloseValidation_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Cloture d'un sondage by=par closed=Sondage clos Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Confirmation confirmClose=Are you sure you want to close this poll ? This operation is irreversible. -confirmDelete=Are you sure you want to delete this poll ? This operation is irreversible. \ No newline at end of file +confirmDelete=Are you sure you want to delete this poll ? This operation is irreversible. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ConfirmPoll_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Confirmation confirmClose=\u00CAtes-vous s\u00FBr de vouloir clore ce sondage ? Cette op\u00E9ration est irr\u00E9versible. -confirmDelete=\u00CAtes-vous s\u00FBr de vouloir supprimer ce sondage ? Cette op\u00E9ration est irr\u00E9versible. \ No newline at end of file +confirmDelete=\u00CAtes-vous s\u00FBr de vouloir supprimer ce sondage ? Cette op\u00E9ration est irr\u00E9versible. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Creation confirmation by=by created=Poll created @@ -5,4 +28,4 @@ votePage=The link below leads to the page to vote for your poll. Save it and send it to the people that you want to vote : editPage=The link below leads to the page to modify your poll. Save it to be able to modify your poll later if you need it or to close it : register=If you are a logged user, you can find these links on the page -myPolls=My polls \ No newline at end of file +myPolls=My polls Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/CreationValidation_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Cr\u00E9ation d'un sondage by=par created=Sondage cr\u00E9\u00E9 Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Vote title2=Picture returnVote-help=Back to vote -returnCount-help=Back to results \ No newline at end of file +returnCount-help=Back to results Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ImageDisplay_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Vote title2=Image returnVote-help=Retour au vote -returnCount-help=Retour aux r\u00E9sultats \ No newline at end of file +returnCount-help=Retour aux r\u00E9sultats Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Poll modification by=by modified=Poll modified @@ -5,4 +28,4 @@ votePage=The link below leads to the page to vote for your poll. Save it and send it to the people that you want to vote : editPage=The link below leads to the page to modify your poll. Save it to be able to modify your poll later if you need it or to close it : register=If you are a logged user, you can find these links on the page -myPolls=My polls \ No newline at end of file +myPolls=My polls Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/ModificationValidation_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Modification d'un sondage by=par modified=Sondage modifi\u00E9 Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Poll creation title-new=New poll prev-button=<< Previous @@ -103,4 +126,4 @@ addChoice=Add a choice noChoice-validate=You must provide at least one choice. choice-validate=Choices must be unique. -uploadError=An error occurred while uploading files. Maximum size allowed is %s per file, and %s total. \ No newline at end of file +uploadError=An error occurred while uploading files. Maximum size allowed is %s per file, and %s total. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollCreation_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Cr\u00E9ation d'un sondage title-new=Nouveau sondage prev-button=<< Pr\u00E9c\u00E9dent @@ -103,4 +126,4 @@ addChoice=Ajouter un choix noChoice-validate=Vous devez saisir au moins un choix. choice-validate=Les choix doivent \u00EAtre uniques. -uploadError=Une erreur s'est produite lors du transfert des fichiers. La taille maximale autoris\u00E9e est de %s par fichier et %s au total. \ No newline at end of file +uploadError=Une erreur s'est produite lors du transfert des fichiers. La taille maximale autoris\u00E9e est de %s par fichier et %s au total. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1 +1,24 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1 +1,24 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollForm_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### pageTitle-create=Cr\u00e9ation d'un nouveau sondage mainTitle-create=Nouveau sondage @@ -90,4 +113,4 @@ addChoice=Ajouter un choix noChoice-validate=Vous devez saisir au moins un choix. choice-validate=Les choix doivent \u00eatre uniques. -uploadError=Une erreur s'est produite lors du transfert des fichiers. La taille maximale autoris\u00e9e est de %s par fichier et %s au total. \ No newline at end of file +uploadError=Une erreur s'est produite lors du transfert des fichiers. La taille maximale autoris\u00e9e est de %s par fichier et %s au total. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Poll modification prev-button=<< Previous next-button=Next >> @@ -68,4 +91,4 @@ #choices choicesLegend=Step %d: poll choices DTF-pattern=MM/dd/yyyy h:mm a -desc-label=Description \ No newline at end of file +desc-label=Description Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/PollModification_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Modification d'un sondage prev-button=<< Pr\u00E9c\u00E9dent next-button=Suivant >> @@ -68,4 +91,4 @@ #choices choicesLegend=\u00C9tape %d : les choix de votre sondage DTF-pattern=dd/MM/yyyy HH:mm -desc-label=Description \ No newline at end of file +desc-label=Description Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Results return-help=Back to poll normalVote-help=The chart show the total of votes by choice. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/Results_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=R\u00E9sultats return-help=Retour au sondage normalVote-help=Le diagramme repr\u00E9sente le cumul des votes par choix. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Vote about=About the poll creator-label=Creator: Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/poll/VoteForPoll_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Vote about=A propos du sondage creator-label=Cr\u00E9ateur : Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Your voting lists accountExists=%s already exists in this list. listExists=%s list already exists. @@ -28,4 +51,4 @@ accountsFile-label=CSV import accountsFile-help=You can import a list from a CSV file containing a voting person per line (name, email) accountsUrl-label=LDAP import -accountsUrl-help=You can import a list providing a LDAP search URL (ldap[s]://<hostname>:<port>/<base_dn>?<attributes>?<scope>?<filter>) Entries must contain attributes cn and mail \ No newline at end of file +accountsUrl-help=You can import a list providing a LDAP search URL (ldap[s]://<hostname>:<port>/<base_dn>?<attributes>?<scope>?<filter>) Entries must contain attributes cn and mail Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserLists_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### #title=Vos listes de votants #accountExists=L'identifiant de vote %s existe d\u00E9j\u00E0 dans cette liste. #listExists=La liste %s existe d\u00E9j\u00E0. @@ -28,4 +51,4 @@ #accountsFile-label=Import CSV #accountsFile-help=Vous pouvez importer une liste \u00E0 partir d'un fichier CSV contenant un votant par ligne (nom, email) #accountsUrl-label=Import LDAP -#accountsUrl-help=Vous pouvez importer une liste en utilisant une URL de recherche LDAP (ldap[s]://<hostname>:<port>/<base_dn>?<attributes>?<scope>?<filter>) Les entr\u00E9es doivent contenir les attributs cn et mail \ No newline at end of file +#accountsUrl-help=Vous pouvez importer une liste en utilisant une URL de recherche LDAP (ldap[s]://<hostname>:<port>/<base_dn>?<attributes>?<scope>?<filter>) Les entr\u00E9es doivent contenir les attributs cn et mail Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Polls created subtitle=Polls you have proposed noUser=You must be logged to access to your polls.\n Please fill the form below. @@ -5,4 +28,4 @@ #import importPoll-help=You can import a poll from a XML file -invalidFile=%s is not a XML file. \ No newline at end of file +invalidFile=%s is not a XML file. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsCreated_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Sondages cr\u00E9\u00E9s subtitle=Liste des sondages que vous avez propos\u00E9s noUser=Vous devez \u00EAtre identifi\u00E9 pour pouvoir acc\u00E9der \u00E0 vos sondages.\n Veuillez remplir le formulaire ci-dessous. @@ -5,4 +28,4 @@ #import importPoll-help=Vous pouvez importer un sondage \u00E0 partir d'un fichier XML -invalidFile=Le fichier %s n'est pas un fichier XML. \ No newline at end of file +invalidFile=Le fichier %s n'est pas un fichier XML. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Polls participated invitedPolls=Polls for which you are invited to vote participatedPolls=Polls in which you are involved @@ -2,2 +25,2 @@ noUser=You must be logged to access to your polls.\n Please fill the form below. -noPolls=No poll. \ No newline at end of file +noPolls=No poll. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserPollsParticipated_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Sondages particip\u00E9s invitedPolls=Liste des sondages pour lesquels vous \u00EAtes invit\u00E9 \u00E0 voter participatedPolls=Liste des sondages pour lesquels vous avez vot\u00E9 @@ -2,2 +25,2 @@ noUser=Vous devez \u00EAtre identifi\u00E9 pour pouvoir acc\u00E9der \u00E0 vos sondages.\n Veuillez remplir le formulaire ci-dessous. -noPolls=Aucun sondage. \ No newline at end of file +noPolls=Aucun sondage. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=My Account login-label=User name password-label=Password * @@ -20,4 +43,4 @@ passwords-dont-match=Two versions of password do not match. noUser=You must be logged to access to your account.\n Please fill the form below. badPassword=Your password is invalid. -emailAlreadyExists=A user already registered with this email. \ No newline at end of file +emailAlreadyExists=A user already registered with this email. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserProfile_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Mon Compte login-label=Identifiant password-label=Mot de passe * @@ -20,4 +43,4 @@ passwordVerify-minlength-message=Votre mot de passe doit comporter au moins 6 caract\u00E8res. noUser=Vous devez \u00EAtre identifi\u00E9 pour pouvoir acc\u00E9der \u00E0 votre compte.\n Veuillez remplir le formulaire ci-dessous. badPassword=Votre mot de passe est invalide. -emailAlreadyExists=Un utilisateur est d\u00E9j\u00E0 enregistr\u00E9 avec cet email. \ No newline at end of file +emailAlreadyExists=Un utilisateur est d\u00E9j\u00E0 enregistr\u00E9 avec cet email. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_en.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_en.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=Register login-label=Login * password1-label=Password * @@ -17,4 +40,4 @@ password2-minlength-message=Your password must be at least 6 characters long. passwords-dont-match=Two versions of password do not match. loginAlreadyExists=A user already registered with this login. -emailAlreadyExists=A user already registered with this email. \ No newline at end of file +emailAlreadyExists=A user already registered with this email. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_fr.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/pages/user/UserRegister_fr.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### title=S'enregistrer login-label=Identifiant * password1-label=Mot de passe * @@ -15,4 +38,4 @@ password1-minlength-message=Votre mot de passe doit comporter au moins 6 caract\u00E8res. passwordVerify-required-message=Vous devez r\u00E9p\u00E9ter votre mot de passe pour confirmation. passwordVerify-minlength-message=Votre mot de passe doit comporter au moins 6 caract\u00E8res. -passwords-dont-match=Les deux mots de passe ne correspondent pas. \ No newline at end of file +passwords-dont-match=Les deux mots de passe ne correspondent pas. Modified: trunk/pollen-ui/src/main/webapp/Connection.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/Connection.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/Connection.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:border t:addressBar="addressBar" t:pageLogo="literal:Index" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -20,4 +43,4 @@ </fieldset> </t:form> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/ErrorPage.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/ErrorPage.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/ErrorPage.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ -<t:border t:addressBar="addressBar" t:pageLogo="literal:Index" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> - -</t:border> + +<t:border t:addressBar="addressBar" t:pageLogo="literal:Index" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> + +</t:border> Modified: trunk/pollen-ui/src/main/webapp/Index.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/Index.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/Index.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:border t:addressBar="addressBar" t:pageLogo="literal:Index" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -18,4 +41,4 @@ </t:pagelink> </div> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Web Interface +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### # This is where global application properties go. # Title Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/web.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + +  <t:border t:address="address" t:pageLogo="literal:Index" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -47,4 +70,4 @@ <t:LoginComponent /> </p:else> </t:if> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/admin/AdminUsers.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/admin/AdminUsers.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/admin/AdminUsers.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:border t:addressBar="addressBar" t:pageLogo="literal:Index" t:pageTitle="prop:title" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -78,4 +101,4 @@ </p> </form> </t:zone> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/css/account.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/account.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/account.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #myAccountFormDiv fieldset { border: 1px solid #aab; padding: 15px; @@ -40,4 +63,4 @@ text-align: center; margin-top: 20px; padding-left: 0px; -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/webapp/css/common.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/common.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/common.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* Document : common Created on : 30 mars 2010, 10:40:20 Modified: trunk/pollen-ui/src/main/webapp/css/grid.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/grid.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/grid.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ DIV.t-data-grid { font-family: Arial, Helvetica, sans-serif; margin-top:20px; Modified: trunk/pollen-ui/src/main/webapp/css/lightbox.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/lightbox.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/lightbox.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #lightbox{ position: absolute; left: 0; width: 100%; z-index: 100; text-align: center; line-height: 0;} #lightbox img{ width: auto; height: auto;} #lightbox a img{ border: none; } Modified: trunk/pollen-ui/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/main.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/main.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ body { background-color: #FFF; background-repeat: no-repeat; @@ -420,4 +443,4 @@ text-align: center; margin-top: 20px; padding-left: 0px; -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/webapp/css/poll.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/poll.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/poll.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* Document : poll Created on : 2 mars 2010, 14:10:25 Modified: trunk/pollen-ui/src/main/webapp/css/pollCreation.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/pollCreation.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/pollCreation.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #pollCreationZone { width: 550px; margin: auto; @@ -119,4 +142,4 @@ .buttons input { margin-left: 10px; -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/webapp/css/pollsAdmin.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/pollsAdmin.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/pollsAdmin.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ DIV.t-data-grid { font-family: Arial, Helvetica, sans-serif; margin-top:20px; Modified: trunk/pollen-ui/src/main/webapp/css/pollsCreated.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/pollsCreated.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/pollsCreated.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #importPollDiv { width: 350px; margin: auto; Modified: trunk/pollen-ui/src/main/webapp/css/pollsParticipated.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/pollsParticipated.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/pollsParticipated.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ DIV.t-data-grid { font-family: Arial, Helvetica, sans-serif; margin-top:20px; Modified: trunk/pollen-ui/src/main/webapp/css/register.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/register.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/register.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #po-user-register form fieldset { border: 1px solid #aab; padding: 15px; @@ -40,4 +63,4 @@ text-align: center; margin-top: 20px; padding-left: 0px; -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/webapp/css/results.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/results.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/results.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #resultTop { width: 700px; margin: auto; @@ -41,4 +64,4 @@ margin: auto; margin-top: 20px; text-align: center; -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/webapp/css/users.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/users.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/users.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* Document : users Created on : 5 mai 2010, 11:15:04 Modified: trunk/pollen-ui/src/main/webapp/css/usersAdmin.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/usersAdmin.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/usersAdmin.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ DIV.t-data-grid { font-family: Arial, Helvetica, sans-serif; margin-top:20px; Modified: trunk/pollen-ui/src/main/webapp/css/vote.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/vote.css 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/css/vote.css 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ #pollTop { width: 700px; margin: auto; @@ -189,4 +212,4 @@ #commentsDiv div { padding: 5px 15px; -} \ No newline at end of file +} Modified: trunk/pollen-ui/src/main/webapp/poll/CloseValidation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/CloseValidation.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/CloseValidation.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -16,4 +39,4 @@ ${message:register} <t:PageLink t:page="user/PollsCreated">${message:myPolls}</t:PageLink>. </div> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/ConfirmPoll.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/ConfirmPoll.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/ConfirmPoll.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -13,4 +36,4 @@ <button type="button">${message:validate}</button> </t:ActionLink> </div> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/CreationValidation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/CreationValidation.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/CreationValidation.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -24,4 +47,4 @@ ${message:register} <t:PageLink t:page="user/PollsCreated">${message:myPolls}</t:PageLink>. </div> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/ImageDisplay.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +  <t:border t:address="address" t:pageLogo="${pageStyle}" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -24,4 +47,4 @@ <div class="center" style="margin-top: 10px;"> ${choice.description} </div> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/ModificationValidation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/ModificationValidation.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/ModificationValidation.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -24,4 +47,4 @@ ${message:register} <t:PageLink t:page="user/PollsCreated">${message:myPolls}</t:PageLink>. </div> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/PollCreation.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -303,4 +326,4 @@ </t:zone> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/PollForm.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollForm.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/PollForm.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,402 +1,425 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html t:type="border" t:addressBar="addressBar" t:pageLogo="literal:Creation" - t:pageBodyId="p-pollForm" t:pageTitle="prop:pageTitle" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" - xmlns:p="tapestry:parameter"> - - <h1 class="titlePoll"> - <t:if t:test="createMode"> - ${message:mainTitle-create} - <p:else>${poll.title}</p:else> - </t:if> - </h1> - - <t:zone t:id="mainZone" t:update="show"> - <form t:type="form" t:id="mainForm" t:zone="mainZone" action="post"> - <t:errors /> - <t:formFragment t:id="mainFormFragment" t:visible="mainStep"> - -  - <div id="p-pollForm-mainInfos"> - <fieldset> - <legend> - <img class="form-toggle" - src="${asset:context:img/1uparrow.png}" alt="toggle" /> ${message:legend-mainInfos} - </legend> - <div class="form-block"> - <p> - <span><label t:type="label" t:for="title" />: - </span> - <input type="text" t:type="textfield" class="title" t:id="title" - value="poll.title" t:validate="required" /> - </p> - - <p> - <span><label t:type="label" t:for="creatorName" />: - </span> - <input type="text" t:type="textfield" t:id="creatorName" - value="poll.creator.name" - t:validate="required,minlength=2" />  - <label t:type="label" t:for="email" />:  - <input type="text" t:type="textfield" class="email" t:id="email" - value="poll.creator.email" t:validate="regexp" /> - </p> - - <p> - <span><label t:type="label" t:for="description" />:  - </span> - <textarea t:type="textarea" cols="80" rows="2" - t:id="description" t:value="poll.description"> - ${poll.description} - </textarea> - </p> - - <p> -  - <span><label t:type="label" t:for="beginDate" />:  - </span> - <input t:type="ck/dateTimeField" t:id="beginDate" - value="poll.beginDate" t:validate="regexp" - t:datePattern="message:date-pattern" t:timePicker="true" - t:timePickerAdjacent="true" /> -  - <label t:type="label" t:for="endDate" />:  - <input t:type="ck/dateTimeField" t:id="endDate" - value="poll.endDate" t:validate="regexp" - t:datePattern="message:date-pattern" t:timePicker="true" - t:timePickerAdjacent="true" /> - <label t:type="label" t:for="voteCountingType" />:  - <select t:type="select" t:id="voteCountingType" - t:value="poll.voteCountingType" t:validate="required"> - <option></option> - </select> - <span t:type="ck/Tooltip" title="${message:help}" - t:value="${message:voteCounting-help}" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="${message:help}" /> - </span> - </p> - </div> - </fieldset> - </div> -  - <div id="p-pollForm-options"> - <fieldset> - <legend> -  -  - <img class="form-toggle" - src="${asset:context:img/1downarrow.png}" /> ${message:legend-options} - </legend> - <div class="form-block clearfix" style="display:none;"> -  -  - <div class="left-column fleft"> - <p> - <input t:type="checkbox" t:id="anonymous" - value="poll.anonymous" /> - <label t:type="label" t:for="anonymous" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:anonymous-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <input t:type="checkbox" t:id="continuousResults" - value="poll.continuousResults" /> - <label t:type="label" t:for="continuousResults" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:continuousResults-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <input t:type="checkbox" t:id="choiceAddAllowed" - value="poll.choiceAddAllowed" - t:mixins="triggerfragment" - t:fragment="choiceDateFragment" /> - <label t:type="label" t:for="choiceAddAllowed" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:choiceAddAllowed-help}" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <t:formFragment t:id="choiceDateFragment" - t:visible="poll.choiceAddAllowed"> - <label t:type="label" t:for="beginChoiceDate" /> - <input t:type="ck/dateTimeField" t:id="beginChoiceDate" - value="poll.beginChoiceDate" t:validate="regexp" - t:datePattern="message:date-pattern" - t:timePicker="true" - t:timePickerAdjacent="true" /> - <br /> - <label t:type="label" t:for="endChoiceDate" /> - <input t:type="ck/dateTimeField" t:id="endChoiceDate" - value="poll.endChoiceDate" t:validate="regexp" - t:datePattern="message:date-pattern" - t:timePicker="true" - t:timePickerAdjacent="true" /> - </t:formFragment> - </p> - <p> - <input t:type="checkbox" t:id="sendNotification" - value="hasNotification" - disabled="notificationDisabled" - t:mixins="triggerfragment" - t:fragment="notificationFragment" /> - <label t:type="label" t:for="sendNotification" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:sendNotification-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <t:formFragment id="notificationHidden" - t:id="notificationFragment" - t:visible="hasNotification"> - <label t:type="label" t:for="notification" /> - <input t:type="textfield" t:id="notification" - value="notification.sensibility" t:size="3" - t:validate="min=0" /> - ${message:notification-label2} - </t:formFragment> - </p> - </div> -  - <div class="fleft"> - <p> - <input t:type="checkbox" t:id="anonymousVoteAllowed" - value="poll.anonymousVoteAllowed" - disabled="anonymousVoteAllowedDisabled" /> - <label t:type="label" t:for="anonymousVoteAllowed" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:anonymousVoteAllowed-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <input t:type="checkbox" t:id="publicResults" - value="poll.publicResults" - disabled="publicResultsDisabled" /> - <label t:type="label" t:for="publicResults" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:publicResults-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <input t:type="checkbox" t:id="choiceNb" value="hasChoiceNb" - disabled="choiceNbDisabled" - t:mixins="triggerFragment" - t:fragment="choiceNbFragment" /> - <label t:type="label" t:for="choiceNb" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:choiceNb-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <t:formFragment id="choiceNbHidden" t:id="choiceNbFragment" - t:visible="hasChoiceNb"> - <label t:type="label" t:for="maxChoiceNb" /> - <input t:type="textfield" t:id="maxChoiceNb" - t:value="poll.maxChoiceNb" t:size="1" - t:validate="min=0" /> - </t:formFragment> - </p> - <p> - <input t:type="checkbox" t:id="sendReminder" - t:value="hasReminder" disabled="reminderDisabled" - t:mixins="triggerfragment" - t:fragment="reminderFragment" /> - <label t:type="label" t:for="sendReminder" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:sendReminder-help" - t:effect="appear"> - <img src="${asset:context:img/help.png}" - alt="message:help" /> - </span> - </p> - - <p> - <t:formFragment id="reminderHidden" t:id="reminderFragment" - t:visible="hasReminder"> - <input t:type="textfield" t:id="reminder" - t:value="reminder.sensibility" t:size="1" - t:validate="min=0" /> - <label t:type="label" t:for="reminder" /> - </t:formFragment> - </p> - </div> -  - </div> - </fieldset> - </div> -  - <div id="p-pollForm-lists"> - <fieldset> - <legend> - <label t:type="label" t:for="pollType" />:  -  -  - <select t:type="select" t:id="pollType" t:value="poll.pollType" - t:validate="required" - t:mixins="ck/onEvent" t:event="change" - t:onCompleteCallback="onConfirmRefreshZone" /> - <span t:type="ck/Tooltip" title="message:help" - t:value="message:pollType-help" t:effect="appear"> - <img src="${asset:context:img/help.png}" alt="message:help" /> - </span> - </legend> - <div t:type="zone" t:id="listsZone" id="p-pollForm-lists-zone" - class="form-block" t:update="show"> - <t:if t:test="canDisplayLists()"> - <t:nuiton.feedback t:id="listsFeedback" /> - <br /> - <t:subForm t:visible="refreshListsZone"> - <t:if t:test="poll.pollType.group"> - <p> - <label t:type="label" t:for="groupName" />:  - <input t:type="textfield" t:id="groupName" - value="listName" />  - <input t:type="submit" t:id="addList" - value="${message:pollen.ui.button.add}" /> - </p> - - <p class="center"> - <t:loop t:source="lists" t:value="list" - t:encoder="model"> - <input class="list-edition${styleSelected}" - t:type="nuiton/submitContext" - t:context="list.name" t:id="editList" - value="${list.name}" /> - <t:if t:test="currentListSelected"> - <a t:type="actionlink" t:id="removeList" - t:zone="p-pollForm-lists-zone"> - <span t:type="any" - t:mixins="nuiton/confirm"> - <img src="${asset:context:img/delete.png}" - alt="${message:delete}" /> - </span> - </a> - </t:if> - </t:loop> - </p> - </t:if> - <t:if t:test="listSelected"> - <div class="t-data-grid"> - <table class="t-data-grid"> - <thead> - <tr> - <th> - ${message:pollen.ui.participant.name-label} - </th> - <th> - ${message:pollen.ui.participant.email-label} - </th> - <th> - ${message:pollen.ui.participant.weight-label} - </th> - <th></th> - </tr> - </thead> - <tbody> - <tr t:type="ajaxformloop" t:id="participants" - source="listModel.participants" - value="participant" t:encoder="listModel"> - <td> - <t:textfield t:id="participantName" - value="participant.name" - size="20" - t:validate="required" /> - </td> - <td> - <t:textfield t:id="participantEmail" - value="participant.email" - size="25" - t:validate="required,regexp" /> - </td> - <td> - <t:textfield t:id="participantWeight" - value="participant.weight" - size="1" /> - </td> - <td> - <t:removerowlink> - <img src="${asset:context:img/delete.png}" - alt="${message:delete}" /> - </t:removerowlink> - </td> - <p:addRow> - <td colspan="4" class="center"> - <t:addrowlink> - ${message:pollen.ui.participant.add} - </t:addrowlink> - </td> - </p:addRow> - </tr> - </tbody> - </table> - </div> - </t:if> - </t:subForm> - </t:if> - </div> - </fieldset> - </div> - <p class="center"> - <input t:type="submit" t:id="choiceText" value="TEXT" /> - <input t:type="submit" t:id="choiceDate" value="DATE" /> - <input t:type="submit" t:id="choiceImage" value="IMAGE" /> - </p> - </t:formFragment> - </form> - <t:if t:test="choiceStep"> -  - -  - <form t:type="form" t:id="choiceForm" action="tapestry"> - <t:errors /> -  - <t:delegate t:to="choiceTypeBlock" /> - <t:block t:id="choiceTextBlock"> - <t:choiceTextForm t:model="model" /> - </t:block> - <t:block t:id="choiceDateBlock"> - <t:choiceDateForm t:model="model" /> - </t:block> - <t:block t:id="choiceImageBlock"> - <t:choiceImageForm t:model="model" /> - </t:block> - <p class="center"> - <input t:type="submit" t:id="mainStep" value="PREVIOUS" /> - <input t:type="submit" t:id="save" value="SAVE" /> - </p> - </form> - </t:if> - </t:zone> -</html> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html t:type="border" t:addressBar="addressBar" t:pageLogo="literal:Creation" + t:pageBodyId="p-pollForm" t:pageTitle="prop:pageTitle" + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" + xmlns:p="tapestry:parameter"> + + <h1 class="titlePoll"> + <t:if t:test="createMode"> + ${message:mainTitle-create} + <p:else>${poll.title}</p:else> + </t:if> + </h1> + + <t:zone t:id="mainZone" t:update="show"> + <form t:type="form" t:id="mainForm" t:zone="mainZone" action="post"> + <t:errors /> + <t:formFragment t:id="mainFormFragment" t:visible="mainStep"> + +  + <div id="p-pollForm-mainInfos"> + <fieldset> + <legend> + <img class="form-toggle" + src="${asset:context:img/1uparrow.png}" alt="toggle" /> ${message:legend-mainInfos} + </legend> + <div class="form-block"> + <p> + <span><label t:type="label" t:for="title" />: + </span> + <input type="text" t:type="textfield" class="title" t:id="title" + value="poll.title" t:validate="required" /> + </p> + + <p> + <span><label t:type="label" t:for="creatorName" />: + </span> + <input type="text" t:type="textfield" t:id="creatorName" + value="poll.creator.name" + t:validate="required,minlength=2" />  + <label t:type="label" t:for="email" />:  + <input type="text" t:type="textfield" class="email" t:id="email" + value="poll.creator.email" t:validate="regexp" /> + </p> + + <p> + <span><label t:type="label" t:for="description" />:  + </span> + <textarea t:type="textarea" cols="80" rows="2" + t:id="description" t:value="poll.description"> + ${poll.description} + </textarea> + </p> + + <p> +  + <span><label t:type="label" t:for="beginDate" />:  + </span> + <input t:type="ck/dateTimeField" t:id="beginDate" + value="poll.beginDate" t:validate="regexp" + t:datePattern="message:date-pattern" t:timePicker="true" + t:timePickerAdjacent="true" /> +  + <label t:type="label" t:for="endDate" />:  + <input t:type="ck/dateTimeField" t:id="endDate" + value="poll.endDate" t:validate="regexp" + t:datePattern="message:date-pattern" t:timePicker="true" + t:timePickerAdjacent="true" /> + <label t:type="label" t:for="voteCountingType" />:  + <select t:type="select" t:id="voteCountingType" + t:value="poll.voteCountingType" t:validate="required"> + <option></option> + </select> + <span t:type="ck/Tooltip" title="${message:help}" + t:value="${message:voteCounting-help}" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="${message:help}" /> + </span> + </p> + </div> + </fieldset> + </div> +  + <div id="p-pollForm-options"> + <fieldset> + <legend> +  +  + <img class="form-toggle" + src="${asset:context:img/1downarrow.png}" /> ${message:legend-options} + </legend> + <div class="form-block clearfix" style="display:none;"> +  +  + <div class="left-column fleft"> + <p> + <input t:type="checkbox" t:id="anonymous" + value="poll.anonymous" /> + <label t:type="label" t:for="anonymous" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:anonymous-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <input t:type="checkbox" t:id="continuousResults" + value="poll.continuousResults" /> + <label t:type="label" t:for="continuousResults" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:continuousResults-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <input t:type="checkbox" t:id="choiceAddAllowed" + value="poll.choiceAddAllowed" + t:mixins="triggerfragment" + t:fragment="choiceDateFragment" /> + <label t:type="label" t:for="choiceAddAllowed" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:choiceAddAllowed-help}" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <t:formFragment t:id="choiceDateFragment" + t:visible="poll.choiceAddAllowed"> + <label t:type="label" t:for="beginChoiceDate" /> + <input t:type="ck/dateTimeField" t:id="beginChoiceDate" + value="poll.beginChoiceDate" t:validate="regexp" + t:datePattern="message:date-pattern" + t:timePicker="true" + t:timePickerAdjacent="true" /> + <br /> + <label t:type="label" t:for="endChoiceDate" /> + <input t:type="ck/dateTimeField" t:id="endChoiceDate" + value="poll.endChoiceDate" t:validate="regexp" + t:datePattern="message:date-pattern" + t:timePicker="true" + t:timePickerAdjacent="true" /> + </t:formFragment> + </p> + <p> + <input t:type="checkbox" t:id="sendNotification" + value="hasNotification" + disabled="notificationDisabled" + t:mixins="triggerfragment" + t:fragment="notificationFragment" /> + <label t:type="label" t:for="sendNotification" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:sendNotification-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <t:formFragment id="notificationHidden" + t:id="notificationFragment" + t:visible="hasNotification"> + <label t:type="label" t:for="notification" /> + <input t:type="textfield" t:id="notification" + value="notification.sensibility" t:size="3" + t:validate="min=0" /> + ${message:notification-label2} + </t:formFragment> + </p> + </div> +  + <div class="fleft"> + <p> + <input t:type="checkbox" t:id="anonymousVoteAllowed" + value="poll.anonymousVoteAllowed" + disabled="anonymousVoteAllowedDisabled" /> + <label t:type="label" t:for="anonymousVoteAllowed" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:anonymousVoteAllowed-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <input t:type="checkbox" t:id="publicResults" + value="poll.publicResults" + disabled="publicResultsDisabled" /> + <label t:type="label" t:for="publicResults" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:publicResults-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <input t:type="checkbox" t:id="choiceNb" value="hasChoiceNb" + disabled="choiceNbDisabled" + t:mixins="triggerFragment" + t:fragment="choiceNbFragment" /> + <label t:type="label" t:for="choiceNb" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:choiceNb-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <t:formFragment id="choiceNbHidden" t:id="choiceNbFragment" + t:visible="hasChoiceNb"> + <label t:type="label" t:for="maxChoiceNb" /> + <input t:type="textfield" t:id="maxChoiceNb" + t:value="poll.maxChoiceNb" t:size="1" + t:validate="min=0" /> + </t:formFragment> + </p> + <p> + <input t:type="checkbox" t:id="sendReminder" + t:value="hasReminder" disabled="reminderDisabled" + t:mixins="triggerfragment" + t:fragment="reminderFragment" /> + <label t:type="label" t:for="sendReminder" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:sendReminder-help" + t:effect="appear"> + <img src="${asset:context:img/help.png}" + alt="message:help" /> + </span> + </p> + + <p> + <t:formFragment id="reminderHidden" t:id="reminderFragment" + t:visible="hasReminder"> + <input t:type="textfield" t:id="reminder" + t:value="reminder.sensibility" t:size="1" + t:validate="min=0" /> + <label t:type="label" t:for="reminder" /> + </t:formFragment> + </p> + </div> +  + </div> + </fieldset> + </div> +  + <div id="p-pollForm-lists"> + <fieldset> + <legend> + <label t:type="label" t:for="pollType" />:  +  +  + <select t:type="select" t:id="pollType" t:value="poll.pollType" + t:validate="required" + t:mixins="ck/onEvent" t:event="change" + t:onCompleteCallback="onConfirmRefreshZone" /> + <span t:type="ck/Tooltip" title="message:help" + t:value="message:pollType-help" t:effect="appear"> + <img src="${asset:context:img/help.png}" alt="message:help" /> + </span> + </legend> + <div t:type="zone" t:id="listsZone" id="p-pollForm-lists-zone" + class="form-block" t:update="show"> + <t:if t:test="canDisplayLists()"> + <t:nuiton.feedback t:id="listsFeedback" /> + <br /> + <t:subForm t:visible="refreshListsZone"> + <t:if t:test="poll.pollType.group"> + <p> + <label t:type="label" t:for="groupName" />:  + <input t:type="textfield" t:id="groupName" + value="listName" />  + <input t:type="submit" t:id="addList" + value="${message:pollen.ui.button.add}" /> + </p> + + <p class="center"> + <t:loop t:source="lists" t:value="list" + t:encoder="model"> + <input class="list-edition${styleSelected}" + t:type="nuiton/submitContext" + t:context="list.name" t:id="editList" + value="${list.name}" /> + <t:if t:test="currentListSelected"> + <a t:type="actionlink" t:id="removeList" + t:zone="p-pollForm-lists-zone"> + <span t:type="any" + t:mixins="nuiton/confirm"> + <img src="${asset:context:img/delete.png}" + alt="${message:delete}" /> + </span> + </a> + </t:if> + </t:loop> + </p> + </t:if> + <t:if t:test="listSelected"> + <div class="t-data-grid"> + <table class="t-data-grid"> + <thead> + <tr> + <th> + ${message:pollen.ui.participant.name-label} + </th> + <th> + ${message:pollen.ui.participant.email-label} + </th> + <th> + ${message:pollen.ui.participant.weight-label} + </th> + <th></th> + </tr> + </thead> + <tbody> + <tr t:type="ajaxformloop" t:id="participants" + source="listModel.participants" + value="participant" t:encoder="listModel"> + <td> + <t:textfield t:id="participantName" + value="participant.name" + size="20" + t:validate="required" /> + </td> + <td> + <t:textfield t:id="participantEmail" + value="participant.email" + size="25" + t:validate="required,regexp" /> + </td> + <td> + <t:textfield t:id="participantWeight" + value="participant.weight" + size="1" /> + </td> + <td> + <t:removerowlink> + <img src="${asset:context:img/delete.png}" + alt="${message:delete}" /> + </t:removerowlink> + </td> + <p:addRow> + <td colspan="4" class="center"> + <t:addrowlink> + ${message:pollen.ui.participant.add} + </t:addrowlink> + </td> + </p:addRow> + </tr> + </tbody> + </table> + </div> + </t:if> + </t:subForm> + </t:if> + </div> + </fieldset> + </div> + <p class="center"> + <input t:type="submit" t:id="choiceText" value="TEXT" /> + <input t:type="submit" t:id="choiceDate" value="DATE" /> + <input t:type="submit" t:id="choiceImage" value="IMAGE" /> + </p> + </t:formFragment> + </form> + <t:if t:test="choiceStep"> +  + +  + <form t:type="form" t:id="choiceForm" action="tapestry"> + <t:errors /> +  + <t:delegate t:to="choiceTypeBlock" /> + <t:block t:id="choiceTextBlock"> + <t:choiceTextForm t:model="model" /> + </t:block> + <t:block t:id="choiceDateBlock"> + <t:choiceDateForm t:model="model" /> + </t:block> + <t:block t:id="choiceImageBlock"> + <t:choiceImageForm t:model="model" /> + </t:block> + <p class="center"> + <input t:type="submit" t:id="mainStep" value="PREVIOUS" /> + <input t:type="submit" t:id="save" value="SAVE" /> + </p> + </form> + </t:if> + </t:zone> +</html> Modified: trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/PollLinks.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html t:type="border" t:addressBar="addressBar" t:pageLogo="literal:Creation" t:pageTitle="prop:title" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -41,4 +64,4 @@ <t:PageLink t:page="user/PollsCreated">${message:pollen.ui.poll.links.myPolls}</t:PageLink>. </div> </t:unless> -</html> \ No newline at end of file +</html> Modified: trunk/pollen-ui/src/main/webapp/poll/PollModification.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/PollModification.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/PollModification.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -202,4 +225,4 @@ </t:unless> </t:if> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/Results.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/Results.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/Results.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:VoteCounting" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -141,4 +164,4 @@ </t:zone> </t:if> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/poll/VoteForPoll.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html t:type="border" t:addressBar="addressBar" t:pageLogo="literal:Vote" t:feedFilename="prop:uri.pollUid" @@ -322,4 +345,4 @@  -</html> \ No newline at end of file +</html> Modified: trunk/pollen-ui/src/main/webapp/user/UserLists.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/user/UserLists.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/user/UserLists.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <t:border t:addressBar="addressBar" t:pageLogo="literal:Creation" t:pageTitle="prop:title" t:pageBodyId="p-userLists" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -22,4 +45,4 @@ </t:if> <t:userListsCreate /> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/user/UserPollsCreated.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/user/UserPollsCreated.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/user/UserPollsCreated.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -60,4 +83,4 @@ <t:LoginComponent /> </p:else> </t:if> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/user/UserPollsParticipated.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/user/UserPollsParticipated.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/user/UserPollsParticipated.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:address="address" t:pageLogo="literal:Vote" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -47,4 +70,4 @@ <t:LoginComponent /> </p:else> </t:if> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/user/UserProfile.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/user/UserProfile.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/user/UserProfile.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:addressBar="addressBar" t:pageLogo="literal:Creation" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> @@ -88,4 +111,4 @@ </div> </t:form> </t:zone> -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/main/webapp/user/UserRegister.tml =================================================================== --- trunk/pollen-ui/src/main/webapp/user/UserRegister.tml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/main/webapp/user/UserRegister.tml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ + <t:border t:addressBar="addressBar" t:pageLogo="literal:Creation" t:pageTitle="prop:title" t:pageBodyId="po-user-register" @@ -48,4 +71,4 @@ </form> </t:zone>  -</t:border> \ No newline at end of file +</t:border> Modified: trunk/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/CSVAccountUtilTest.java =================================================================== --- trunk/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/CSVAccountUtilTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-ui/src/test/java/org/chorem/pollen/ui/utils/CSVAccountUtilTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Web Interface + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.ui.utils; @@ -68,4 +91,4 @@ System.out.println("importList"); } -} \ No newline at end of file +} Added: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-votecounting/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -0,0 +1,12 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - Common Public License Version 1.0 +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun Nov 21 22:32:55 CET 2010 +org.jdom--jdom--1.1--jar=Lesser General Public License (LGPL) v 3.0 Property changes on: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -153,4 +176,4 @@ public String toString() { return "Choice id=" + idChoice + " _ value=" + value; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -325,4 +348,4 @@ List<PercentageBehavior> list = new ArrayList<PercentageBehavior>(choices); choiceDTO.setPercentage(Utils.calculatePercentage(choice, list)); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -223,4 +246,4 @@ return resChoices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -118,4 +141,4 @@ public List<Vote> list() { return getVotes(); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -47,4 +70,4 @@ */ public void executeStats(List<Choice> choices, boolean groupCounting, Choice choice, ChoiceDTO choiceDTO); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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.votecounting.business; import java.util.List; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -39,4 +62,4 @@ } return 0; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -119,4 +142,4 @@ List<PercentageBehavior> list = new ArrayList<PercentageBehavior>(choices); choiceDTO.setPercentage(Utils.calculatePercentage(choice, list)); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -72,4 +95,4 @@ public String getVotingID() { return this.votingID; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Gestion des dépouillements. */ -package org.chorem.pollen.votecounting.business; \ No newline at end of file +package org.chorem.pollen.votecounting.business; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -113,4 +136,4 @@ public void setResult(boolean result) { this.result = result; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -47,4 +70,4 @@ public void setText(String text) { this.text = text; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -75,4 +98,4 @@ public void setHidden(boolean hidden) { this.hidden = hidden; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -248,4 +271,4 @@ public void setComments(List<CommentDTO> comments) { this.comments = comments; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -91,4 +114,4 @@ this.choices = choices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -53,4 +76,4 @@ this.idChoice = idChoice; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -79,4 +102,4 @@ this.votingPersons = votingPersons; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -107,4 +130,4 @@ this.choices = choices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Data Transfert Objects. */ -package org.chorem.pollen.votecounting.dto; \ No newline at end of file +package org.chorem.pollen.votecounting.dto; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -590,4 +613,4 @@ return vectorChoices; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -29,4 +52,4 @@ public VoteCountingResultDTO executeVoteCounting(PollDTO poll); public VoteCountingResultDTO executeGroupCounting(PollDTO poll); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -225,4 +248,4 @@ group.addVote(vote.getValue(), weight, votingID); } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Services proposés par le module VoteCounting. */ -package org.chorem.pollen.votecounting.services; \ No newline at end of file +package org.chorem.pollen.votecounting.services; Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -25,4 +48,4 @@ */ public interface ListBehavior<T> { public List<T> list(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -23,4 +46,4 @@ */ public interface PercentageBehavior { public double value(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -60,4 +83,4 @@ return nbVotes; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,27 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /** * Classes utilitaires. */ -package org.chorem.pollen.votecounting.utils; \ No newline at end of file +package org.chorem.pollen.votecounting.utils; Modified: trunk/pollen-votecounting/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting/src/main/resources/log4j.properties 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/main/resources/log4j.properties 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Vote Counting +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2010 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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -38,4 +61,4 @@ * @return le sondage */ public PollDTO createTestPoll(); -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -240,4 +263,4 @@ return groups; } -} \ No newline at end of file +} Modified: trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java =================================================================== --- trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * @@ -143,4 +166,4 @@ VoteCountingResultDTO result = instance.executeGroupCounting(poll); //assertEquals(expResult, result); } -} \ No newline at end of file +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/pom.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -27,30 +29,23 @@ <dependencies> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> <version>1.2</version> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2</version> </dependency> + <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.1</version> </dependency> + +  <developers> <developer> @@ -224,7 +233,7 @@ <developer> <id>kmorin</id> <name>Kevin MORIN</name> - <email>km(a)kevinmorin.net</email> + <email>morin(a)codelutin.com</email> <organization>ALMA - Code Lutin</organization> <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> <timezone>+1</timezone> @@ -284,7 +293,6 @@ <developer> <id>nrannou</id> <name>Nolwenn RANNOU</name> - <email>rannou(a)codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> <timezone>+1</timezone> @@ -319,19 +327,21 @@   - <topia.version>2.4.2</topia.version> - <eugene.version>2.1.1</eugene.version> - <i18n.version>1.2.2</i18n.version> - <tapestry.version>5.1.0.5</tapestry.version> - <nuiton-web.version>0.1</nuiton-web.version> - <nuiton-utils.version>1.3.1</nuiton-utils.version> - <processor.version>1.0.2</processor.version> + <topiaVersion>2.4.2</topiaVersion> + <eugenePluginVersion>2.1.1</eugenePluginVersion> + <nuitonI18nVersion>1.2.2</nuitonI18nVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> + <nuitonWebVersion>0.1</nuitonWebVersion> + <nuitonUtilsVersion>1.3.1</nuitonUtilsVersion> + <processorPluginVersion>1.0.2</processorPluginVersion> + <slf4jVersion>1.5.10</slf4jVersion> + <jFreeVersion>1.0.12</jFreeVersion>  <siteLocales>en,fr</siteLocales>  - <license.licenseName>gpl_v3</license.licenseName> + <license.licenseName>agpl_v3</license.licenseName> </properties> @@ -346,7 +356,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> + <version>${jrstPluginVersion}</version> </dependency> </dependencies> </plugin> @@ -360,7 +370,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> + <version>${eugenePluginVersion}</version> <configuration> <inputs>zargo</inputs> <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> @@ -369,14 +379,14 @@ <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> + <version>${topiaVersion}</version> </dependency> </dependencies> </plugin> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> + <version>${nuitonI18nVersion}</version> </plugin> </plugins> </pluginManagement> @@ -395,7 +405,8 @@ <scm> <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk + <developerConnection> + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/license/project.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,28 @@ <?xml version='1.0' encoding='UTF-8'?> + + <project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProjectDescriptor-…"> Modified: trunk/src/site/fr/rst/analyse.rst =================================================================== --- trunk/src/site/fr/rst/analyse.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/analyse.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Analyse ======= Modified: trunk/src/site/fr/rst/architecture.rst =================================================================== --- trunk/src/site/fr/rst/architecture.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/architecture.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Architecture de l'application Pollen ==================================== Modified: trunk/src/site/fr/rst/assentiment.rst =================================================================== --- trunk/src/site/fr/rst/assentiment.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/assentiment.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Dépouillement par assentiment ----------------------------- Modified: trunk/src/site/fr/rst/business.rst =================================================================== --- trunk/src/site/fr/rst/business.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/business.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - business ======== Modified: trunk/src/site/fr/rst/condorcet.rst =================================================================== --- trunk/src/site/fr/rst/condorcet.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/condorcet.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Méthode de vote Condorcet ------------------------- @@ -17,4 +40,4 @@ (Source : Wikipedia_ ) -.. _Wikipedia: http://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet#Utilisation_du_vote_de_… \ No newline at end of file +.. _Wikipedia: http://fr.wikipedia.org/wiki/M%C3%A9thode_Condorcet#Utilisation_du_vote_de_… Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/depouillement.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Les méthodes de dépouillement de Pollen --------------------------------------- Modified: trunk/src/site/fr/rst/developer.rst =================================================================== --- trunk/src/site/fr/rst/developer.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/developer.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Documentation développeur ========================= @@ -16,4 +39,4 @@ .. _Architecture: architecture.html .. _Module de depouillement votecounting: votecounting.html .. _Module metier business: business.html -.. _Module de presentation ui: ui.html \ No newline at end of file +.. _Module de presentation ui: ui.html Modified: trunk/src/site/fr/rst/historique.rst =================================================================== --- trunk/src/site/fr/rst/historique.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/historique.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Pourquoi Pollen est Pollen ? ---------------------------- @@ -18,4 +41,4 @@ .. _CodeLutin: http://www.codelutin.com .. _Libre-Entreprise: http://www.libre-entreprise.org -.. _Glasnost: http://glasnost.entrouvert.org \ No newline at end of file +.. _Glasnost: http://glasnost.entrouvert.org Modified: trunk/src/site/fr/rst/importVotersList.rst =================================================================== --- trunk/src/site/fr/rst/importVotersList.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/importVotersList.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - =========================== Créer des listes de votants =========================== Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/index.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Bienvenue sur le site de Pollen =============================== Modified: trunk/src/site/fr/rst/install.rst =================================================================== --- trunk/src/site/fr/rst/install.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/install.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Installation ============ @@ -72,4 +95,4 @@ Vous pouvez aussi utiliser des options de lancement : http://winstone.sourceforge.net/#commandLine -.. _Tomcat: http://tomcat.apache.org/ \ No newline at end of file +.. _Tomcat: http://tomcat.apache.org/ Modified: trunk/src/site/fr/rst/nombre.rst =================================================================== --- trunk/src/site/fr/rst/nombre.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/nombre.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Dépouillement par nombre ------------------------ Modified: trunk/src/site/fr/rst/pourcentage.rst =================================================================== --- trunk/src/site/fr/rst/pourcentage.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/pourcentage.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Vote par pourcentage ou vote par estimation moyenne --------------------------------------------------- Modified: trunk/src/site/fr/rst/tutoriel.rst =================================================================== --- trunk/src/site/fr/rst/tutoriel.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/tutoriel.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Tutoriel ======== Modified: trunk/src/site/fr/rst/ui.rst =================================================================== --- trunk/src/site/fr/rst/ui.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/ui.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - UI == Modified: trunk/src/site/fr/rst/user.rst =================================================================== --- trunk/src/site/fr/rst/user.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/user.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Documentation utilisateur ========================= @@ -7,4 +30,4 @@ créer un sondage, voter et dépouiller les résultats à la fin. .. _guide d installation: install.html -.. _tutoriel: tutoriel.html \ No newline at end of file +.. _tutoriel: tutoriel.html Modified: trunk/src/site/fr/rst/votecounting.rst =================================================================== --- trunk/src/site/fr/rst/votecounting.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/fr/rst/votecounting.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - VoteCounting ============ Modified: trunk/src/site/rst/analyse.rst =================================================================== --- trunk/src/site/rst/analyse.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/analyse.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,366 +1,389 @@ -Analysis -======== - -:Author: Erwan NEMA <nemawan(a)hotmail.com> -:Author: Nolwenn Rannou <rannou(a)codelutin.com> -:Revision: $Revision: 2773 $ -:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ - -The needs -~~~~~~~~~ - -Pollen project is aimed to create a libre poll application with a web interface -and more functionalities regarding the other similar application already existing. -The principle is : a user create a poll and then send the link to the voters. -He can then follow the poll progression online. The voters vote by filling their -name and their vote. - -The poll creation have to be easy but allow the following operations : - -- define voters lists -- chose the vote counting principle (percentage, Condorcet,...) -- allow every voter to add new choices -- vote anonymously if we use a restricted list of voters -- send reminders to people who did not vote (if restricted voters list) -- define begin and end dates for polls. -- define the number of votes possible per person (1 choice or N choices amongst the propositions) -- be able to add a global comment or to his vote. -- define, before the vote, the weight of each voter (if restricted voters list) -- represent graphically the poll results -- export a poll in a standard format (poll, voters lists, poll results) for exchanges with other poll tools. - -Global concepts -~~~~~~~~~~~~~~~ - -This paragraph presents the different concepts manipulated by the poll application. -The table represents this application's data table. - -- Poll (Poll) : a poll is a survey with is taken by participants (voters). The poll/survey can focus on a question with multi-answers, a date choice. -- Prevent rule (PreventRule) : management of poll end rules (voters quota, date before reminder, ...). -- Free poll (FreePoll) : the poll is available for anybody. -- Restricted poll (RestrictedPoll) : the poll is available only for the restricted list members. -- Group poll (GroupPoll) : the poll is available for members of more than one restricted list. -- Vote : answer from a voter to the question, this answer is stored before beeing processed, the voters identity is then known. -- Anonymous vote (AnonymousVote) : answer from a voter to the question asked without knowing the voter's identity. -- Vote counting type (VoteCounting) : Poll results utilizing, the vote counting can be done normally(just counting the votes), in the case of multiple choice with Condorcet method (a preference order is attributed to choice), or by attributing a percentage to each choice. -- Choice type (ChoiceType) : Define the question and so the answer/choice type (yes/no, hour choice, date choice, text, picture,...) -- User (User) : People managing the poll, this person can be logged in or not. -- Voter (VotingPerson): People voting in a poll. -- Poll creator (PollAccount): Person already logged in or not, creating a poll. -- Voters predefined list (PersonList) : Voters predefined list created by a user and stored in the system. This list can be the base for a voters restricted list. -- Voters list (VotingList) : List of voters participating in a poll. -- Voters list type (ListType) : -- Free voters list : Voters list, voters may not need to have an account on pollen. -- Restricted voters list (RestrictedVotingList): Voters restricted list, all the voters are known and will be identified from this list. -- Voting group (VotingGroup): Restricted list of voters that might be globally balanced when counting votes (ex : developers group) -- Global comment (Comment): Comment on the poll -- Local comment (Vote.comment): Comment on a vote. - -Vote counting types -+++++++++++++++++++ - -For first versions, we implement usual vote counting : - -- Simple or free vote : this is the vote for a single answer, each answer gets votes, the sum of the votes for each answer represent the poll results. -- Condorcet vote : the voter sort his choices by preference order (ex a>b>c), we compare each choice to the other votes by counting the won or lost duels, the results of this comparison represents the poll results. -- Grade balanced vote : each choice is graded (function of a scale), the sum of the grades per answer represents the poll results. - -Balancing -+++++++++ - -Each voter may not have the same weight in a vote, so this balancing will have -consequences when counting votes. The balancing of each voter is possible in a -restricted list. -It is also possible to balance group of voters when several voters lists participate -to a poll. - -Anonymous vote -++++++++++++++ - -The application allows to vote anonymously in case of polls based on restricted -list of voters. The anonymity is guaranteed for all the voters of the list. -In this case, the vote will be counted for the voter, but the application will -not link the voter to the vote. -Giving its identity when voting anonymously can annoy the voter. So in the case -of an anonymous vote, the voter will identify himself with a anonymity number. -The voter does not know how the application works for anonymous votes, this -approach will reinsure him regarding his anonymity. - -Functionalities (Use cases) -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The application use case diagram in UML 2.0 format allows to present in a easy -and concise way the different application actors and functionalities. -As a reminder, the <<includes>> stereotype precise a use case decomposition with -a mandatory consideration of included use case, the <<extends>> stereotype -precise an optional functionality extension, the <<generalize>> stereotype makes -reference to the inheritance notion. - -There are 3 actors in the system : - -- The administrator manage users and can moderate polls. -- The user can manage a poll and vote -- The voter can vote. - -.. image:: schemas/UC_Gestiondesvotes.png - :alt: Functionalities - -The use cases "create a poll" (créer un sondage), "vote" (voter) and "count a -poll's votes" (dépouiller un sondage) will be explained in the following -paragraphs. - -Create a poll -+++++++++++++ - -The detailed scenario of poll creation. - -Actor : - -the user - -Pre-conditions : - -Base scenario : - -1. The user chose to create a poll. -2. The user chose the free poll type. -3. The user fill the poll title. -4. The user fill the poll description. -5. The user fill his name. -6. The user chose a end date for the poll. -7. The user chose the textual vote option type. -8. The user fill the different options in. -9. The user chose a unique choice poll. -10. The user validate the creation. -11. 2 URLs are automatically generated by the application : - One URL to administrate the poll. - One UTL to vote. -12. The user is invited to save those URLs. -13. An email is automatically sent by the application to the administrators -(who can moderate polls). - -Variations :: - - 1a. The user authenticate himself. - 1a1. If the user is black-listed, the connection is impossible, an error message is displayed. - 2a. The user chose a restricted type poll. - 2a1. The user chose a predefined list. - - The user can balance each voter of the list for the poll. - 2a2. The user chose several predefined lists (groups). - - The user can balance each voter of each group. - - The user can balance each group. - 2a3. The user chose to create a restricted list by filling in voters name and email address. - The user specifies if choices can be added by voters. - The user specifies if it is an anonymous poll. - 5a. If user is blacklisted, creation is not possible, an error message is shown. - 7a. The user chose to vote for dates. - 7b. The user chose to vote for images. - 9a. The user can chose a multiple choice poll is the number of option is more than 2. - The user chose the vote counting type. - 10a. If the user is authenticated or filled his email in, the system ask if the user wants to receive an email for each vote. - 11a. If the user filled in his email, an emails with the 2 poll's URLs is automatically sent to the poll creator. - 11b. If the user is authenticated, an email with the 2 poll's URLs is automatically sent when the poll is created. - 11c. In the case of a poll on a restricted list, an email with a link to vote and the voters login is sent to every voter of the poll. - 12a. The non authenticated user does not save the URLs : the user cannot reach the polls anymore. - 13a. If the poll is unvalidated by the administrator : the poll is deleted, the URL cannot be reached anymore. - If the user gave authentication information or is logged, he is blacklisted. - -Extensions :: - - 5a. The user gives his name and email. - 5a1. see variation 5a. - 10a. The user can write a comment before validating the poll. - -A figure of the actions based on the base scenario and its variations follows : - - -.. image:: schemas/CreerSondage.jpg - :alt: Create Poll part 1 - -.. image:: schemas/CreerSondage2.jpg - :alt: Create Poll part 2 - - -Vote -++++ - -Actor : - -Voter - -Pre-conditions : - -The voter knows the poll URL. -The poll is reachable. - -Base scenario : - -1. The voter connects to the poll from a URL. -2. The voter selects his choice(s). -3. The voter fills in his login. -4. The voter submits his vote. - -Variations :: - - 2a. If the poll is restricted and this option is authorised on the current poll, the voter can add a poll choice. The poll creator and all the participants are alerted by email of the poll modification. - 4a. If the voter did not filled in a valid login : an error message is shown, the vote is not counted. - 4b. If the voter is black listed by the poll creator, he is not allowed to vote : an error message is shown, the vote is not taken into account. - -Extensions :: - - 3a. The user fills in his vote login and email address. - 3b. The voter writes a comment on his vote. - 4a. The user receive a vote confirmation email. - 4b. The poll creator receives an email regarding the voter's vote. - 4c. The voter can modify his vote. - -.. image:: schemas/Voter.jpg - :alt: Vote - -Count the votes -+++++++++++++++ - -Actor - -The user - -Pre-conditions - -The poll ended. - -Base scenario : - -1. The user can connect to the poll by the URL. -2. The user chose to count the votes. -3. The application runs the vote counting algorithm. -4. The results (voters, answers) of the poll are displayed. - -Variations :: - - 1a. The user authenticate in the application and chose the poll from his polls list. - 1a1. see 1b - 1b. If the votes have already been counted, the results are displayed. - 2a. The votes are automatically counted when the poll's end date is reached. - 4a. In the case of a poll with an anonymous list of voters : the voters informations are not displayed. - -Extensions :: - - 4a. The result can be exported to XML format. - -The interactions chronology between the different entities defined in the analysis -step is presented in the following sequence diagram : - -.. image:: schemas/Depouiller.jpg - :alt: Base scenario - -.. image:: schemas/Depouiller_1a.jpg - :alt: Variation 1a - -Non functional requirements -~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The application does not need to only follow the requirements stated in the -project specifications. Several constraints have to be studied. - -Those constraints are : - -- The system have to store and restore manipulated informations : a DBMS use will manage those needs. -- The application will not by strongly linked to any DBMS on the market : the use of a persistence layer is mandatory. -- The application have to be service oriented, all the business layer will be separated from the presentation layer. -- The system have to insure full security to the user for transactions done from and to the server and in the software use itself. This implies a proper right management at the application level. - -The business classes -~~~~~~~~~~~~~~~~~~~~ - -The analysis process gives the data part of the application's coherent class diagram. -This diagram will be the base for the implementation of the database scheme. - -.. image:: schemas/DC_Pollen.png - :alt: analysis class diagram. - -**Classes and associated comment** : - -- PollType, Poll type. -- ChoiceType, Choice type. -- VoteCounting, Vote count type. -- UserAccount, User logged in the application. -- PollAccount, Account for a poll, gather the voter and poll creator notion. -- PersonList, Predefined list of accounts. -- VotingList, Voters list. -- PersonToList, Voters from a list. -- Vote, Vote. -- Choice, Vote choice. -- VoteToChoice, Choice value when using preference order in a multichoice poll. - -**Result class** (poll results) : - -Attribute : - -- byGroup, Indicate that the votes have been counted by groups. - -**Poll class** (poll) : - -Attributes : - -- pollId, unique poll id. -- beginChoiceDate, Choice adding begin date. -- maxChoiceNb, Maximum choice number for a voter. -- choiceAddAllowed, Allow adding choices to poll. -- closed, Indicate that the poll is closed. -- anonymous, Poll with anonymous votes and voters. -- anonymousVoteAllowed, Anonymous vote allowed. -- publicResults, Indicate wether the poll's results are public or not. -- continuousResults, Indicate wether the polls results are visible while people are voting. - -**PreventRule class** (notification rules) : - -Notification rules associated to the polls. They are used to execute actions -(message displaying, email sending,...) depending on various criteria. - -Attributes : - -- method, action to launch. -- scope, context in which the action can be launched. -- sensibility, value firing the action launch. -- active, Indicate if the rule is active -- oneTime, Indicate if the action can be launched only one time (the rule is unactivated after its first launch). -- repeated, Indicate if the action can be launched repeatedly (an action with sensibility 2 will be launch for values 2, 4, 6, 8, ...). - -.. image:: schemas/DC_PreventRules.png - :alt: Poll's lifecycle. - -The PreventRuleMAnager class allows to manage notifications rules. When the -*execute()* method is called, the method defined by the rule is executed if its -sensibility and context are valid. - -Example : Display a message every 100 votes :: - - // Define a rule : context : "vote", sensibility 100, repeatable - PreventRuleDTO preventRule = new PreventRuleDTO("vote", 100, true, - PreventRuleManager.PRINT_ACTION); - PreventRuleManager manager = new PreventRuleManager(preventRule); - - // We launch the execution by precising a context and a sensibility - // The manager verifies if the action have to be executed regarding the rule - // and the parameters. - manager.execute("vote",100,"un message"); // display "un message" - manager.execute("vote",200,"autre message"); // display "autre message" - - // Examples doing nothing - manager.execute("scope",100); // "scope" is not the right context - manager.execute("vote",50); // 50 is not the right sensibility - -Notifications are used in Pollen to send confirmation message when creating an -account, alert a poll creator when they are new votes or remind people they did -not vote... - -Poll's lifecycle -~~~~~~~~~~~~~~~~ - -At the beginning, a poll had only two states : open and closed, to which the -begin and end dates notion was linked. Once it was possible to add choices to a -poll, it has been necessary to add a begin and end date for choice adding and -the states describes in the following figure : - -.. image:: schemas/DET_PollState.png - :alt: Poll's lifecycle +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - +Analysis +======== + +:Author: Erwan NEMA <nemawan(a)hotmail.com> +:Author: Nolwenn Rannou <rannou(a)codelutin.com> +:Revision: $Revision: 2773 $ +:Date: $Date: 2009-09-09 12:05:20 +0200 (mer., 09 sept. 2009) $ + +The needs +~~~~~~~~~ + +Pollen project is aimed to create a libre poll application with a web interface +and more functionalities regarding the other similar application already existing. +The principle is : a user create a poll and then send the link to the voters. +He can then follow the poll progression online. The voters vote by filling their +name and their vote. + +The poll creation have to be easy but allow the following operations : + +- define voters lists +- chose the vote counting principle (percentage, Condorcet,...) +- allow every voter to add new choices +- vote anonymously if we use a restricted list of voters +- send reminders to people who did not vote (if restricted voters list) +- define begin and end dates for polls. +- define the number of votes possible per person (1 choice or N choices amongst the propositions) +- be able to add a global comment or to his vote. +- define, before the vote, the weight of each voter (if restricted voters list) +- represent graphically the poll results +- export a poll in a standard format (poll, voters lists, poll results) for exchanges with other poll tools. + +Global concepts +~~~~~~~~~~~~~~~ + +This paragraph presents the different concepts manipulated by the poll application. +The table represents this application's data table. + +- Poll (Poll) : a poll is a survey with is taken by participants (voters). The poll/survey can focus on a question with multi-answers, a date choice. +- Prevent rule (PreventRule) : management of poll end rules (voters quota, date before reminder, ...). +- Free poll (FreePoll) : the poll is available for anybody. +- Restricted poll (RestrictedPoll) : the poll is available only for the restricted list members. +- Group poll (GroupPoll) : the poll is available for members of more than one restricted list. +- Vote : answer from a voter to the question, this answer is stored before beeing processed, the voters identity is then known. +- Anonymous vote (AnonymousVote) : answer from a voter to the question asked without knowing the voter's identity. +- Vote counting type (VoteCounting) : Poll results utilizing, the vote counting can be done normally(just counting the votes), in the case of multiple choice with Condorcet method (a preference order is attributed to choice), or by attributing a percentage to each choice. +- Choice type (ChoiceType) : Define the question and so the answer/choice type (yes/no, hour choice, date choice, text, picture,...) +- User (User) : People managing the poll, this person can be logged in or not. +- Voter (VotingPerson): People voting in a poll. +- Poll creator (PollAccount): Person already logged in or not, creating a poll. +- Voters predefined list (PersonList) : Voters predefined list created by a user and stored in the system. This list can be the base for a voters restricted list. +- Voters list (VotingList) : List of voters participating in a poll. +- Voters list type (ListType) : +- Free voters list : Voters list, voters may not need to have an account on pollen. +- Restricted voters list (RestrictedVotingList): Voters restricted list, all the voters are known and will be identified from this list. +- Voting group (VotingGroup): Restricted list of voters that might be globally balanced when counting votes (ex : developers group) +- Global comment (Comment): Comment on the poll +- Local comment (Vote.comment): Comment on a vote. + +Vote counting types ++++++++++++++++++++ + +For first versions, we implement usual vote counting : + +- Simple or free vote : this is the vote for a single answer, each answer gets votes, the sum of the votes for each answer represent the poll results. +- Condorcet vote : the voter sort his choices by preference order (ex a>b>c), we compare each choice to the other votes by counting the won or lost duels, the results of this comparison represents the poll results. +- Grade balanced vote : each choice is graded (function of a scale), the sum of the grades per answer represents the poll results. + +Balancing ++++++++++ + +Each voter may not have the same weight in a vote, so this balancing will have +consequences when counting votes. The balancing of each voter is possible in a +restricted list. +It is also possible to balance group of voters when several voters lists participate +to a poll. + +Anonymous vote +++++++++++++++ + +The application allows to vote anonymously in case of polls based on restricted +list of voters. The anonymity is guaranteed for all the voters of the list. +In this case, the vote will be counted for the voter, but the application will +not link the voter to the vote. +Giving its identity when voting anonymously can annoy the voter. So in the case +of an anonymous vote, the voter will identify himself with a anonymity number. +The voter does not know how the application works for anonymous votes, this +approach will reinsure him regarding his anonymity. + +Functionalities (Use cases) +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The application use case diagram in UML 2.0 format allows to present in a easy +and concise way the different application actors and functionalities. +As a reminder, the <<includes>> stereotype precise a use case decomposition with +a mandatory consideration of included use case, the <<extends>> stereotype +precise an optional functionality extension, the <<generalize>> stereotype makes +reference to the inheritance notion. + +There are 3 actors in the system : + +- The administrator manage users and can moderate polls. +- The user can manage a poll and vote +- The voter can vote. + +.. image:: schemas/UC_Gestiondesvotes.png + :alt: Functionalities + +The use cases "create a poll" (créer un sondage), "vote" (voter) and "count a +poll's votes" (dépouiller un sondage) will be explained in the following +paragraphs. + +Create a poll ++++++++++++++ + +The detailed scenario of poll creation. + +Actor : + +the user + +Pre-conditions : + +Base scenario : + +1. The user chose to create a poll. +2. The user chose the free poll type. +3. The user fill the poll title. +4. The user fill the poll description. +5. The user fill his name. +6. The user chose a end date for the poll. +7. The user chose the textual vote option type. +8. The user fill the different options in. +9. The user chose a unique choice poll. +10. The user validate the creation. +11. 2 URLs are automatically generated by the application : + One URL to administrate the poll. + One UTL to vote. +12. The user is invited to save those URLs. +13. An email is automatically sent by the application to the administrators +(who can moderate polls). + +Variations :: + + 1a. The user authenticate himself. + 1a1. If the user is black-listed, the connection is impossible, an error message is displayed. + 2a. The user chose a restricted type poll. + 2a1. The user chose a predefined list. + - The user can balance each voter of the list for the poll. + 2a2. The user chose several predefined lists (groups). + - The user can balance each voter of each group. + - The user can balance each group. + 2a3. The user chose to create a restricted list by filling in voters name and email address. + The user specifies if choices can be added by voters. + The user specifies if it is an anonymous poll. + 5a. If user is blacklisted, creation is not possible, an error message is shown. + 7a. The user chose to vote for dates. + 7b. The user chose to vote for images. + 9a. The user can chose a multiple choice poll is the number of option is more than 2. + The user chose the vote counting type. + 10a. If the user is authenticated or filled his email in, the system ask if the user wants to receive an email for each vote. + 11a. If the user filled in his email, an emails with the 2 poll's URLs is automatically sent to the poll creator. + 11b. If the user is authenticated, an email with the 2 poll's URLs is automatically sent when the poll is created. + 11c. In the case of a poll on a restricted list, an email with a link to vote and the voters login is sent to every voter of the poll. + 12a. The non authenticated user does not save the URLs : the user cannot reach the polls anymore. + 13a. If the poll is unvalidated by the administrator : the poll is deleted, the URL cannot be reached anymore. + If the user gave authentication information or is logged, he is blacklisted. + +Extensions :: + + 5a. The user gives his name and email. + 5a1. see variation 5a. + 10a. The user can write a comment before validating the poll. + +A figure of the actions based on the base scenario and its variations follows : + + +.. image:: schemas/CreerSondage.jpg + :alt: Create Poll part 1 + +.. image:: schemas/CreerSondage2.jpg + :alt: Create Poll part 2 + + +Vote +++++ + +Actor : + +Voter + +Pre-conditions : + +The voter knows the poll URL. +The poll is reachable. + +Base scenario : + +1. The voter connects to the poll from a URL. +2. The voter selects his choice(s). +3. The voter fills in his login. +4. The voter submits his vote. + +Variations :: + + 2a. If the poll is restricted and this option is authorised on the current poll, the voter can add a poll choice. The poll creator and all the participants are alerted by email of the poll modification. + 4a. If the voter did not filled in a valid login : an error message is shown, the vote is not counted. + 4b. If the voter is black listed by the poll creator, he is not allowed to vote : an error message is shown, the vote is not taken into account. + +Extensions :: + + 3a. The user fills in his vote login and email address. + 3b. The voter writes a comment on his vote. + 4a. The user receive a vote confirmation email. + 4b. The poll creator receives an email regarding the voter's vote. + 4c. The voter can modify his vote. + +.. image:: schemas/Voter.jpg + :alt: Vote + +Count the votes ++++++++++++++++ + +Actor + +The user + +Pre-conditions + +The poll ended. + +Base scenario : + +1. The user can connect to the poll by the URL. +2. The user chose to count the votes. +3. The application runs the vote counting algorithm. +4. The results (voters, answers) of the poll are displayed. + +Variations :: + + 1a. The user authenticate in the application and chose the poll from his polls list. + 1a1. see 1b + 1b. If the votes have already been counted, the results are displayed. + 2a. The votes are automatically counted when the poll's end date is reached. + 4a. In the case of a poll with an anonymous list of voters : the voters informations are not displayed. + +Extensions :: + + 4a. The result can be exported to XML format. + +The interactions chronology between the different entities defined in the analysis +step is presented in the following sequence diagram : + +.. image:: schemas/Depouiller.jpg + :alt: Base scenario + +.. image:: schemas/Depouiller_1a.jpg + :alt: Variation 1a + +Non functional requirements +~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The application does not need to only follow the requirements stated in the +project specifications. Several constraints have to be studied. + +Those constraints are : + +- The system have to store and restore manipulated informations : a DBMS use will manage those needs. +- The application will not by strongly linked to any DBMS on the market : the use of a persistence layer is mandatory. +- The application have to be service oriented, all the business layer will be separated from the presentation layer. +- The system have to insure full security to the user for transactions done from and to the server and in the software use itself. This implies a proper right management at the application level. + +The business classes +~~~~~~~~~~~~~~~~~~~~ + +The analysis process gives the data part of the application's coherent class diagram. +This diagram will be the base for the implementation of the database scheme. + +.. image:: schemas/DC_Pollen.png + :alt: analysis class diagram. + +**Classes and associated comment** : + +- PollType, Poll type. +- ChoiceType, Choice type. +- VoteCounting, Vote count type. +- UserAccount, User logged in the application. +- PollAccount, Account for a poll, gather the voter and poll creator notion. +- PersonList, Predefined list of accounts. +- VotingList, Voters list. +- PersonToList, Voters from a list. +- Vote, Vote. +- Choice, Vote choice. +- VoteToChoice, Choice value when using preference order in a multichoice poll. + +**Result class** (poll results) : + +Attribute : + +- byGroup, Indicate that the votes have been counted by groups. + +**Poll class** (poll) : + +Attributes : + +- pollId, unique poll id. +- beginChoiceDate, Choice adding begin date. +- maxChoiceNb, Maximum choice number for a voter. +- choiceAddAllowed, Allow adding choices to poll. +- closed, Indicate that the poll is closed. +- anonymous, Poll with anonymous votes and voters. +- anonymousVoteAllowed, Anonymous vote allowed. +- publicResults, Indicate wether the poll's results are public or not. +- continuousResults, Indicate wether the polls results are visible while people are voting. + +**PreventRule class** (notification rules) : + +Notification rules associated to the polls. They are used to execute actions +(message displaying, email sending,...) depending on various criteria. + +Attributes : + +- method, action to launch. +- scope, context in which the action can be launched. +- sensibility, value firing the action launch. +- active, Indicate if the rule is active +- oneTime, Indicate if the action can be launched only one time (the rule is unactivated after its first launch). +- repeated, Indicate if the action can be launched repeatedly (an action with sensibility 2 will be launch for values 2, 4, 6, 8, ...). + +.. image:: schemas/DC_PreventRules.png + :alt: Poll's lifecycle. + +The PreventRuleMAnager class allows to manage notifications rules. When the +*execute()* method is called, the method defined by the rule is executed if its +sensibility and context are valid. + +Example : Display a message every 100 votes :: + + // Define a rule : context : "vote", sensibility 100, repeatable + PreventRuleDTO preventRule = new PreventRuleDTO("vote", 100, true, + PreventRuleManager.PRINT_ACTION); + PreventRuleManager manager = new PreventRuleManager(preventRule); + + // We launch the execution by precising a context and a sensibility + // The manager verifies if the action have to be executed regarding the rule + // and the parameters. + manager.execute("vote",100,"un message"); // display "un message" + manager.execute("vote",200,"autre message"); // display "autre message" + + // Examples doing nothing + manager.execute("scope",100); // "scope" is not the right context + manager.execute("vote",50); // 50 is not the right sensibility + +Notifications are used in Pollen to send confirmation message when creating an +account, alert a poll creator when they are new votes or remind people they did +not vote... + +Poll's lifecycle +~~~~~~~~~~~~~~~~ + +At the beginning, a poll had only two states : open and closed, to which the +begin and end dates notion was linked. Once it was possible to add choices to a +poll, it has been necessary to add a begin and end date for choice adding and +the states describes in the following figure : + +.. image:: schemas/DET_PollState.png + :alt: Poll's lifecycle Modified: trunk/src/site/rst/approval.rst =================================================================== --- trunk/src/site/rst/approval.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/approval.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Approval voting --------------- Modified: trunk/src/site/rst/architecture.rst =================================================================== --- trunk/src/site/rst/architecture.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/architecture.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Pollen architecture =================== Modified: trunk/src/site/rst/business.rst =================================================================== --- trunk/src/site/rst/business.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/business.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Business ======== @@ -72,4 +95,4 @@ The contextUtil class also allows to load the referential tables (vote counting type, poll type, list type, choice type) that do not have their own UI for the moment -from the pollenconfig.properties file. \ No newline at end of file +from the pollenconfig.properties file. Modified: trunk/src/site/rst/condorcet.rst =================================================================== --- trunk/src/site/rst/condorcet.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/condorcet.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Condorcet method ---------------- @@ -16,4 +39,4 @@ (Source : Wikipedia_ ) -.. _Wikipedia: http://en.wikipedia.org/wiki/Condorcet_method \ No newline at end of file +.. _Wikipedia: http://en.wikipedia.org/wiki/Condorcet_method Modified: trunk/src/site/rst/developer.rst =================================================================== --- trunk/src/site/rst/developer.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/developer.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Developer documentation ======================= @@ -19,4 +42,4 @@ .. _architecture: architecture.html .. _votecounting module: votecounting.html .. _business module: business.html -.. _UI module: ui.html \ No newline at end of file +.. _UI module: ui.html Modified: trunk/src/site/rst/historical.rst =================================================================== --- trunk/src/site/rst/historical.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/historical.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Why Pollen is Pollen ? ---------------------- @@ -17,4 +40,4 @@ __ http://www.codelutin.com .. _Libre-Entreprise: http://www.libre-entreprise.org -.. _Glasnost: http://glasnost.entrouvert.org \ No newline at end of file +.. _Glasnost: http://glasnost.entrouvert.org Modified: trunk/src/site/rst/importVotersList.rst =================================================================== --- trunk/src/site/rst/importVotersList.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/importVotersList.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - =================== Create voting Lists =================== Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/index.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Welcome to Pollen website ========================= Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/install.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Installation guide ================== @@ -73,4 +96,4 @@ You can also use command line option to configure launch : http://winstone.sourceforge.net/#commandLine -.. _Tomcat: http://tomcat.apache.org/ \ No newline at end of file +.. _Tomcat: http://tomcat.apache.org/ Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/methods.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Pollen's votecounting methods ----------------------------- Modified: trunk/src/site/rst/number.rst =================================================================== --- trunk/src/site/rst/number.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/number.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Counting by numbers ------------------- Modified: trunk/src/site/rst/percentage.rst =================================================================== --- trunk/src/site/rst/percentage.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/percentage.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Vote by percentage ------------------ Modified: trunk/src/site/rst/tutoriel.rst =================================================================== --- trunk/src/site/rst/tutoriel.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/tutoriel.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - Tutorial ======== Modified: trunk/src/site/rst/ui.rst =================================================================== --- trunk/src/site/rst/ui.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/ui.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - UI == Modified: trunk/src/site/rst/user.rst =================================================================== --- trunk/src/site/rst/user.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/user.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - User documentation ================== Modified: trunk/src/site/rst/votecounting.rst =================================================================== --- trunk/src/site/rst/votecounting.rst 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/rst/votecounting.rst 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 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% +.. - VoteCounting ============ Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/site_en.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <publishDate format="dd/MM/yyyy"/> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-11-21 14:32:40 UTC (rev 3052) +++ trunk/src/site/site_fr.xml 2010-11-21 23:05:17 UTC (rev 3053) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <publishDate format="dd/MM/yyyy"/>

1 0

r3052 - trunk
by tchemit＠users.chorem.org 21 Nov '10

21 Nov '10

Author: tchemit Date: 2010-11-21 15:32:40 +0100 (Sun, 21 Nov 2010) New Revision: 3052 Url: http://chorem.org/repositories/revision/pollen/3052 Log: Update mavenpom4redmine to 2.4.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:42:04 UTC (rev 3051) +++ trunk/pom.xml 2010-11-21 14:32:40 UTC (rev 3052) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.2</version> + <version>2.4.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3051 - trunk
by tchemit＠users.chorem.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:42:04 +0200 (Sun, 17 Oct 2010) New Revision: 3051 Url: http://chorem.org/repositories/revision/pollen/3051 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-14 15:26:33 UTC (rev 3050) +++ trunk/pom.xml 2010-10-17 01:42:04 UTC (rev 3051) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r3050 - in trunk/pollen-ui/src/main/java/org/chorem/pollen/ui: components pages/admin
by fdesbois＠users.chorem.org 14 Oct '10

14 Oct '10

Author: fdesbois Date: 2010-10-14 17:26:33 +0200 (Thu, 14 Oct 2010) New Revision: 3050 Url: http://chorem.org/repositories/revision/pollen/3050 Log: - remove useless public visibility for handlers - format javadoc - reset session when delete user Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java 2010-10-08 23:52:40 UTC (rev 3049) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/UserListsUpdate.java 2010-10-14 15:26:33 UTC (rev 3050) @@ -99,13 +99,26 @@ /***************************** EDIT PARTICIPANT FORM **********************/ /** - * FORM EVENTS ORDER -> RENDER : load size of participants dataSource call - * prepareForRender load participants data + * FORM EVENTS ORDER -> RENDER : + * <p /> + * <ul> + * <li>load size of participants dataSource</li> + * <li>call prepareForRender</li> + * <li>load participants data</li> + * </ul> * <p/> - * FORM EVENTS ORDER -> SUBMIT : call prepareForSubmit load size of - * participants dataSource load participants data load participantEdited to - * push form data (hidden fields in first) call selected on submit button - * call validateForm call success or failure call submit + * FORM EVENTS ORDER -> SUBMIT : + * <p /> + * <ul> + * <li>all prepareForSubmit</li> + * <li>load size of participants dataSource</li> + * <li>load participants data</li> + * <li>load participantEdited to push form data (hidden fields in first)</li> + * <li>call selected on submit button</li> + * <li>call validateForm</li> + * <li>call success or failure</li> + * <li>call submit</li> + * </ul> */ @InjectComponent Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java 2010-10-08 23:52:40 UTC (rev 3049) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/admin/AdminUsers.java 2010-10-14 15:26:33 UTC (rev 3050) @@ -73,7 +73,7 @@ /** Services used by the page * */ @Inject - private Logger logger; + private Logger log; @Inject private ComponentResources resources; @@ -153,9 +153,9 @@ * @param login key of the user from the Grid * @return the usersForm to display form with accountEdited */ - public Object onActionFromEditAccount(String login) { - if (logger.isDebugEnabled()) { - logger.debug("User in edition : " + login); + Object onActionFromEditAccount(String login) { + if (log.isDebugEnabled()) { + log.debug("User in edition : " + login); } accountEdited = accounts.get(login); return usersForm; @@ -168,8 +168,9 @@ * @param login used to delete the user * @see ServiceUser#deleteUser(String) */ - public void onActionFromDeleteAccount(String login) { + void onActionFromDeleteAccount(String login) { serviceUser.deleteUser(login); + resources.discardPersistentFieldChanges(); } /** @@ -177,7 +178,7 @@ * usersForm. The accountEdited will be initialized to properly be saved in * {@link #onValidateFormFromUsersForm()} */ - public void onPrepareForSubmitFromUsersForm() { + void onPrepareForSubmitFromUsersForm() { if (accountEdited == null) { accountEdited = serviceUser.getNewUser(); } @@ -190,13 +191,11 @@ * * @see ServiceUser#updateUser(UserAccount, boolean) */ - public void onValidateFormFromUsersForm() { + void onValidateFormFromUsersForm() { try { serviceUser.updateUser(accountEdited, true); } catch (PollenBusinessException eee) { -// String message = manager.getErrorMessage(eee, messages, logger); -// usersForm.recordError(message); - manager.recordFormError(logger, messages, eee, usersForm); + manager.recordFormError(log, messages, eee, usersForm); } } @@ -206,7 +205,7 @@ * * @return the current page to refresh */ - public Object onSuccessFromUsersForm() { + Object onSuccessFromUsersForm() { addInfo(messages.get("pollen.ui.user.update.success")); return this; } @@ -218,7 +217,7 @@ * * @return the usersForm to refresh (in the usersZone) */ - public Object onFailureFromUsersForm() { + Object onFailureFromUsersForm() { return usersForm; } @@ -245,7 +244,7 @@ * ON_PREPARE :: Callback method for prepare events of the newUserForm. The * newUser will be initialized if needed before render and before submit. */ - public void onPrepareFromNewUserForm() { + void onPrepareFromNewUserForm() { if (newUser == null) { newUser = serviceUser.getNewUser(); } @@ -260,7 +259,7 @@ * * @see ServiceUser#createUser(UserAccount) */ - public void onValidateFormFromNewUserForm() { + void onValidateFormFromNewUserForm() { try { String passwordInfo; if (StringUtils.isNotEmpty(newUser.getEmail())) { @@ -279,7 +278,7 @@ serviceUser.createUser(newUser); addInfo(passwordInfo); } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); + String message = manager.getErrorMessage(log, messages, eee); switch (eee.getType()) { case USER_EMAIL_EXIST: newUserForm.recordError(newEmail, message); @@ -297,10 +296,9 @@ * fields of the page will be discarded to refresh the grid with no order or * page filter. * - * @return the current page to refresh * @see ServiceEmail#sendEmail(PollenEmail) */ - public Object onSuccessFromNewUserForm() { + void onSuccessFromNewUserForm() { addInfo(messages.format("pollen.ui.user.create.success", newUser.getLogin())); // send email if needed @@ -320,7 +318,7 @@ newUser.getLogin(), newUser.getEmail())); } catch (PollenBusinessException eee) { - String message = manager.getErrorMessage(logger, messages, eee); + String message = manager.getErrorMessage(log, messages, eee); addError(message); addInfo(messages.format( "pollen.ui.user.create.emailFailedShowPassword", @@ -330,7 +328,6 @@ // Remove accounts to reset order and current page // This will display the new user created in the first row of the grid resources.discardPersistentFieldChanges(); - return this; } /** @@ -340,7 +337,7 @@ * * @return the newUserForm to refresh (in the newUserZone) */ - public Object onFailureFromNewUserForm() { + Object onFailureFromNewUserForm() { return newUserForm; } }

1 0

r3049 - trunk
by tchemit＠users.chorem.org 08 Oct '10

08 Oct '10

Author: tchemit Date: 2010-10-09 01:52:40 +0200 (Sat, 09 Oct 2010) New Revision: 3049 Url: http://chorem.org/repositories/revision/pollen/3049 Log: Update mavenpom4redmine to 2.3.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-03 15:58:15 UTC (rev 3048) +++ trunk/pom.xml 2010-10-08 23:52:40 UTC (rev 3049) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3</version> + <version>2.3.1</version> </parent> <groupId>org.chorem</groupId>

1 0

r3048 - trunk
by tchemit＠users.chorem.org 03 Oct '10

03 Oct '10

Author: tchemit Date: 2010-10-03 17:58:15 +0200 (Sun, 03 Oct 2010) New Revision: 3048 Url: http://chorem.org/repositories/revision/pollen/3048 Log: Update mavenpom4redmine to 2.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:12:38 UTC (rev 3047) +++ trunk/pom.xml 2010-10-03 15:58:15 UTC (rev 3048) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.6</version> + <version>2.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3047 - trunk
by tchemit＠users.chorem.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:12:38 +0200 (Wed, 29 Sep 2010) New Revision: 3047 Url: http://chorem.org/repositories/revision/pollen/3047 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-09 09:34:25 UTC (rev 3046) +++ trunk/pom.xml 2010-09-29 08:12:38 UTC (rev 3047) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <groupId>org.chorem</groupId>

1 0

r3046 - trunk
by tchemit＠users.chorem.org 09 Sep '10

09 Sep '10

Author: tchemit Date: 2010-09-09 11:34:25 +0200 (Thu, 09 Sep 2010) New Revision: 3046 Url: http://chorem.org/repositories/revision/pollen/3046 Log: Utilisation de mavenpom4redmine 2.2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-08-29 14:23:06 UTC (rev 3045) +++ trunk/pom.xml 2010-09-09 09:34:25 UTC (rev 3046) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.4</version> + <version>2.2.5</version> </parent> <groupId>org.chorem</groupId>

1 0