Pollen-commits

Download

pollen-commits@list.chorem.org

January 2012

4 participants
33 discussions

r3126 - in branches/pollen-1.2.6-struts2: pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-persistence/src/main/java/org/chorem/pollen/entities/migration pollen-persistence/src/main/xmi pollen-persistence/src/test/resources pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-servi
by tchemit＠users.chorem.org 31 Jan '12

31 Jan '12

Author: tchemit Date: 2012-01-31 22:14:15 +0100 (Tue, 31 Jan 2012) New Revision: 3126 Url: http://chorem.org/repositories/revision/pollen/3126 Log: fix licenses + versions Removed: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -40,10 +40,10 @@ import java.util.Properties; /** - * EchoBase configuration. + * Pollen configuration. * * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class PollenConfiguration { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -32,10 +32,10 @@ import java.io.File; /** - * All EchoBase configuration options. + * All Pollen configuration options. * * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -28,10 +28,10 @@ import org.nuiton.topia.persistence.TopiaEntity; /** - * USefull pollen functions. + * Usefull pollen functions. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenFunctions { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -25,7 +25,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class PollenTechnicalException extends RuntimeException { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -41,7 +41,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class PollenTopiaRootContextFactory { Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Deleted: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,26 +0,0 @@ -### -# #%L -# Pollen :: Business -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -#!/bin/sh - -for i in `seq 0 3000`; do echo "\"Test $i\",\"toto+pollen+$i(a)domain.com\",1" >> test3000.csv; done Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -35,7 +35,7 @@ * Instances of this class will be given to service factory. * * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class DefaultPollenServiceContext implements PollenServiceContext { @@ -63,9 +63,9 @@ PollenConfiguration configuration, PollenServiceFactory serviceFactory) { return new DefaultPollenServiceContext(locale, - transaction, - configuration, - serviceFactory); + transaction, + configuration, + serviceFactory); } protected DefaultPollenServiceContext(Locale locale, Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -30,7 +30,7 @@ * * @author tchemit <chemit(a)codelutin.com> * @see PollenServiceContext - * @since 0.1 + * @since 1.2.6 */ public interface PollenService { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -36,7 +36,7 @@ * {@link PollenServiceFactory#newService(Class, PollenServiceContext)} * * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public interface PollenServiceContext { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -31,7 +31,7 @@ * Factory of services. * * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class PollenServiceFactory { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -25,7 +25,6 @@ import com.google.common.base.Preconditions; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateUtils; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.entities.PollenDAOHelper; @@ -35,13 +34,12 @@ import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; -import java.util.Date; import java.util.List; import java.util.Locale; /** * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class PollenServiceSupport implements PollenService { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.2.6 */ -public class FavoriteListNotFoundException extends Exception{ +public class FavoriteListNotFoundException extends Exception { private static final long serialVersionUID = 1L; } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.2.6 */ -public class FavoriteListNotOwnedByUserException extends Exception{ +public class FavoriteListNotOwnedByUserException extends Exception { private static final long serialVersionUID = 1L; } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.2.6 */ -public class ParticipantNotFoundException extends Exception{ +public class ParticipantNotFoundException extends Exception { private static final long serialVersionUID = 1L; } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.2.6 */ -public class ParticipantNotFoundInListException extends Exception{ +public class ParticipantNotFoundInListException extends Exception { private static final long serialVersionUID = 1L; } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -30,7 +30,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenApplicationContext { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -54,7 +54,7 @@ * On stop, just release the application configuration. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenApplicationListener implements ServletContextListener { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -31,7 +31,7 @@ * User session to put in servlet session. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenSession { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -35,7 +35,7 @@ * EchoBase implementation of the {@link TopiaTransactionFilter}. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenTopiaTransactionFilter extends TopiaTransactionFilter { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -35,7 +35,7 @@ * Usefull ui methods. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenUIUtils { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -58,7 +58,7 @@ * untranslated key. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -28,7 +28,7 @@ /** * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class ManagePolls extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -34,7 +34,7 @@ /** * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class ManageUsers extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -33,7 +33,7 @@ * Abstract JSON action with pagination support. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public abstract class AbstractJSONPaginedAction extends PollenActionSupport { @@ -49,12 +49,6 @@ protected PollenPagerBean pager = new PollenPagerBean(); -// // sorting order - asc or desc -// protected String sord; -// -// // get index row - i.e. user click to sort. -// protected String sidx; - protected String filters; public void setRows(Integer rows) { @@ -65,13 +59,8 @@ pager.setPageIndex(page); } -// public String getSord() { -// return sord; -// } - public void setSord(String sord) { pager.setSortAscendant("asc".equals(sord)); -// this.sord = sord; } public String getSidx() { @@ -80,7 +69,6 @@ public void setSidx(String sidx) { pager.setSortColumn(sidx); -// this.sidx = sidx; } public String getFilters() { @@ -91,26 +79,6 @@ this.filters = filters; } -// protected String getSortColumn() { -// String result = null; -// if (useSort()) { -// result = sidx; -// } -// return result; -// } - -// protected boolean isSortAscendant() { -// boolean result = false; -// if (useSort()) { -// result = "asc".equals(sord); -// } -// return result; -// } - -// protected boolean useSort() { -// return StringUtils.isNotEmpty(sidx); -// } - protected Object getFilterObject() throws JSONException { Object filterObject = null; if (StringUtils.isNotEmpty(filters)) { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -37,7 +37,7 @@ * Obtain paginated users. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class GetPolls extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -32,10 +32,10 @@ import java.util.Map; /** - * Get user datas (for json purpose). + * Get user datas. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class GetUser extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -35,7 +35,7 @@ * Obtain paginated users. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class GetUsers extends AbstractJSONPaginedAction { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -40,7 +40,7 @@ * Creates a new poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Create extends PollenActionSupport implements Preparable { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * Display list of created polls. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class CreatedList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * Display a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Edit extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * Display list of participated polls. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class ParticipatedList extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * Display results of a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Result extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -33,7 +33,7 @@ * Update a user. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Edit extends PollenActionSupport { @@ -89,6 +89,7 @@ UserService service = newService(UserService.class); + String result = INPUT; try { UserAccount updatedUser = service.updateUser(user, newPassword, false); @@ -96,20 +97,18 @@ // push back user to session getPollenSession().setUserAccount(updatedUser); - return SUCCESS; + result = SUCCESS; } catch (UserEmailAlreadyUsedException e) { addFieldError("user.email", _("pollen.error.user.email.already.used")); } catch (UserInvalidPasswordException e) { addFieldError("user.password", _("pollen.error.user.invalid.password")); } - // if error go back to input - // reset password user.setPassword(null); newPassword = newPassword2 = null; - return INPUT; + return result; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -34,7 +34,7 @@ * Login user to pollen. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Login extends PollenActionSupport { @@ -66,18 +66,18 @@ UserService service = newService(UserService.class); + String result = ERROR; try { UserAccount userAccount = service.connect(login, password); getPollenSession().setUserAccount(userAccount); addActionMessage(_("pollen.information.your.are.loggued")); - return SUCCESS; + result = SUCCESS; } catch (UserNotFoundException e) { addActionError(_("pollen.error.user.bad.login.or.password")); } catch (UserInvalidPasswordException e) { addActionError(_("pollen.error.user.bad.login.or.password")); } - // if error go back to input - return ERROR; + return result; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ * Logout from pollen. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Logout extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -33,7 +33,7 @@ * Register a new user. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Register extends PollenActionSupport { @@ -68,13 +68,14 @@ UserService service = newService(UserService.class); + String result = INPUT; try { UserAccount createdUser = service.createUser(user, false, getApplicationUrl()); getTransaction().commitTransaction(); getPollenSession().setUserAccount(createdUser); addActionMessage(_("pollen.information.your.are.loggued")); - return SUCCESS; + result = SUCCESS; } catch (UserLoginAlreadyUsedException e) { addFieldError("user.login", _("pollen.error.user.login.already.used")); } catch (UserEmailAlreadyUsedException e) { @@ -87,6 +88,6 @@ user.setPassword(null); password2 = null; - return INPUT; + return result; } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -30,7 +30,7 @@ * Show user account. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class Show extends PollenActionSupport { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -37,7 +37,7 @@ * To check if logged user is admin. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class CheckUserIsAdmin extends AbstractInterceptor { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -35,7 +35,7 @@ * To check user is loggued. If not, then redirect to the {@link #loginAction}. * * @author tchemit <chemit(a)codelutin.com> - * @since 0.1 + * @since 1.2.6 */ public class CheckUserIsLogguedInterceptor extends AbstractInterceptor { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2012 CodeLutin +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -1,10 +1,11 @@ <%-- -#%L - EchoBase :: UI + #%L + Pollen :: UI (strust2) + $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by @@ -19,7 +20,7 @@ You should 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 contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-31 21:14:15 UTC (rev 3126) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2012 CodeLutin + Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-31 21:01:08 UTC (rev 3125) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-31 21:14:15 UTC (rev 3126) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by

1 0

r3125 - in branches/pollen-1.2.6-struts2: pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/test/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll polle
by tchemit＠users.chorem.org 31 Jan '12

31 Jan '12

Author: tchemit Date: 2012-01-31 22:01:08 +0100 (Tue, 31 Jan 2012) New Revision: 3125 Url: http://chorem.org/repositories/revision/pollen/3125 Log: - favorite list management - squeleton for polls management Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp Removed: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,79 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + +import org.apache.commons.lang3.StringUtils; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.util.PagerUtil; + +/** + * Override nuiton pager while adding sort informations. + * <p/> + * Maybe this should be push back to nuiton ? + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollenPagerBean extends PagerUtil.PagerBean { + + private static final long serialVersionUID = 1L; + + // sorting order - asc or desc + protected boolean sortAscendant; + + // get index row - i.e. user click to sort. + protected String sortColumn; + + public boolean isSortAscendant() { + return sortAscendant; + } + + public void setSortAscendant(boolean sortAscendant) { + this.sortAscendant = sortAscendant; + } + + public String getSortColumn() { + return sortColumn; + } + + public void setSortColumn(String sortColumn) { + this.sortColumn = sortColumn; + } + + public static void addPagerToQuery(PollenPagerBean pager, + TopiaQuery query) { + + query.setLimit(pager.getRecordStartIndex(), + pager.getRecordEndIndex() - 1); + + if (StringUtils.isNotEmpty(pager.getSortColumn())) { + if (pager.isSortAscendant()) { + query.addOrder(pager.getSortColumn()); + } else { + query.addOrderDesc(pager.getSortColumn()); + } + } + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class FavoriteListAlreadyExistException extends Exception { Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,35 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class FavoriteListNotFoundException extends Exception{ + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,35 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class FavoriteListNotOwnedByUserException extends Exception{ + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class ParticipantAlreadyFoundInListException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class ParticipantExistWithoutMailException extends Exception { Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,35 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class ParticipantNotFoundException extends Exception{ + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,35 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class ParticipantNotFoundInListException extends Exception{ + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollAlreadyClosedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollAlreadyExistException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class UserEmailAlreadyUsedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class UserInvalidPasswordException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class UserLoginAlreadyUsedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class UserNotFoundException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class VoteDoubloonException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ * TODO * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class VoteNotAllowedException extends Exception { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -38,7 +38,7 @@ * Manage comments on a poll. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class PollCommentService extends PollenServiceSupport { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -23,7 +23,6 @@ */ package org.chorem.pollen.services.impl; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenConfiguration; @@ -35,6 +34,7 @@ import org.chorem.pollen.business.persistence.PollImpl; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.services.PollenPagerBean; import org.chorem.pollen.services.PollenServiceSupport; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaQuery; @@ -79,9 +79,7 @@ return result; } - public List<Poll> getPolls(PagerUtil.PagerBean pager, - String sortColumn, - boolean ascendantOrder) { + public List<Poll> getPolls(PollenPagerBean pager) { try { PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); @@ -90,7 +88,7 @@ pager.setRecords((int) records); PagerUtil.computeRecordIndexesAndPagesNumber(pager); TopiaQuery query = dao.createQuery("e"); - addFilterToQuery(query, pager, sortColumn, ascendantOrder); + PollenPagerBean.addPagerToQuery(pager, query); List<Poll> result = dao.findAllByQuery(query); return result; @@ -99,10 +97,7 @@ } } - public List<Poll> getCreatedPolls(PagerUtil.PagerBean pager, - String sortColumn, - boolean ascendantOrder, - UserAccount user) { + public List<Poll> getCreatedPolls(PollenPagerBean pager, UserAccount user) { try { PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); @@ -114,7 +109,7 @@ PagerUtil.computeRecordIndexesAndPagesNumber(pager); TopiaQuery query = dao.createQuery("e"); - addFilterToQuery(query, pager, sortColumn, ascendantOrder); + PollenPagerBean.addPagerToQuery(pager, query); query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); List<Poll> result = dao.findAllByQuery(query); @@ -124,10 +119,7 @@ } } - public List<Poll> getInvitedPolls(PagerUtil.PagerBean pager, - String sortColumn, - boolean ascendantOrder, - UserAccount user) { + public List<Poll> getInvitedPolls(PollenPagerBean pager, UserAccount user) { try { PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); @@ -139,7 +131,7 @@ PagerUtil.computeRecordIndexesAndPagesNumber(pager); TopiaQuery query = dao.createQuery("e"); - addFilterToQuery(query, pager, sortColumn, ascendantOrder); + PollenPagerBean.addPagerToQuery(pager, query); query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); List<Poll> result = dao.findAllByQuery(query); @@ -149,10 +141,7 @@ } } - public List<Poll> getParticipatedPolls(PagerUtil.PagerBean pager, - String sortColumn, - boolean ascendantOrder, - UserAccount user) { + public List<Poll> getParticipatedPolls(PollenPagerBean pager, UserAccount user) { try { PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); @@ -164,7 +153,7 @@ PagerUtil.computeRecordIndexesAndPagesNumber(pager); TopiaQuery query = dao.createQuery("e"); - addFilterToQuery(query, pager, sortColumn, ascendantOrder); + PollenPagerBean.addPagerToQuery(pager, query); query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); List<Poll> result = dao.findAllByQuery(query); @@ -267,17 +256,8 @@ } } */ - private void addFilterToQuery(TopiaQuery query, PagerUtil.PagerBean pager, String sortColumn, boolean ascendantOrder) { - query.setLimit(pager.getRecordStartIndex(), pager.getRecordEndIndex() - 1); - if (StringUtils.isNotEmpty(sortColumn)) { - if (ascendantOrder) { - query.addOrder(sortColumn); - } else { - query.addOrderDesc(sortColumn); - } - } - } + // // /** // * Build a new Poll instance based on existing {@code poll} (copy) Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -23,17 +23,31 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Preconditions; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.business.persistence.PersonListDAO; +import org.chorem.pollen.business.persistence.PersonListImpl; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollAccountDAO; +import org.chorem.pollen.business.persistence.PollAccountImpl; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.business.persistence.UserAccountImpl; import org.chorem.pollen.entities.PollenBinderHelper; import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.services.PollenPagerBean; import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException; +import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException; +import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException; +import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; +import org.chorem.pollen.services.exceptions.ParticipantNotFoundException; +import org.chorem.pollen.services.exceptions.ParticipantNotFoundInListException; import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; @@ -191,37 +205,34 @@ return result; } - public void deleteUser(String login) { + public void deleteUser(String id) throws UserNotFoundException { try { - UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); - UserAccount user = dao.findByLogin(login); + UserAccountDAO dao = + PollenDAOHelper.getUserAccountDAO(getTransaction()); + UserAccount user = dao.findByTopiaId(id); + + if (user == null) { + throw new UserNotFoundException(); + } dao.delete(user); } catch (TopiaException e) { throw new PollenTechnicalException(e); } } - public List<UserAccount> getUsers(PagerUtil.PagerBean pager, - String sortColumn, - boolean ascendantOrder) { + public List<UserAccount> getUsers(PollenPagerBean pager) { try { - UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); + UserAccountDAO dao = + PollenDAOHelper.getUserAccountDAO(getTransaction()); long records = dao.count(); pager.setRecords((int) records); PagerUtil.computeRecordIndexesAndPagesNumber(pager); TopiaQuery query = dao.createQuery("e"); - query.setLimit(pager.getRecordStartIndex(), pager.getRecordEndIndex() - 1); + PollenPagerBean.addPagerToQuery(pager, query); - if (StringUtils.isNotEmpty(sortColumn)) { - if (ascendantOrder) { - query.addOrder(sortColumn); - } else { - query.addOrderDesc(sortColumn); - } - } List<UserAccount> result = dao.findAllByQuery(query); return result; } catch (TopiaException e) { @@ -229,6 +240,337 @@ } } + public List<PersonList> getFavoriteLists(UserAccount user, + PollenPagerBean pager) { + + try { + + PersonListDAO dao = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + TopiaQuery countQuery = dao.createQuery("e"); + countQuery.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); + long records = dao.countByQuery(countQuery); + + pager.setRecords((int) records); + + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + TopiaQuery query = dao.createQuery("e"); + query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); + PollenPagerBean.addPagerToQuery(pager, query); + + List<PersonList> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public List<PersonList> getFavoriteLists(UserAccount user) { + try { + + PersonListDAO dao = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + TopiaQuery query = dao.createQuery("e"); + query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); + List<PersonList> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public PersonList getFavoriteList(UserAccount user, + String favoriteListId) throws FavoriteListNotFoundException, FavoriteListNotOwnedByUserException { + try { + + PersonListDAO dao = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + PersonList favoriteList = dao.findByTopiaId(favoriteListId); + + if (favoriteList == null) { + throw new FavoriteListNotFoundException(); + } + + // check this favorite belongs to the given user + UserAccount favoriteListOwner = favoriteList.getOwner(); + if (!favoriteListOwner.equals(user)) { + throw new FavoriteListNotOwnedByUserException(); + } + + return favoriteList; + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public List<PollAccount> getFavoriteListUsers(PersonList favoriteList, + PollenPagerBean pager) { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pager); + try { + + int records = favoriteList.sizePollAccount(); + pager.setRecords(records); + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + + PollAccountDAO pollAccountDAO = + PollenDAOHelper.getPollAccountDAO(getTransaction()); + + TopiaQuery query = pollAccountDAO.createQuery("e"); + query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList); + PollenPagerBean.addPagerToQuery(pager, query); + + List<PollAccount> result = pollAccountDAO.findAllByQuery(query); + return result; + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void createFavoriteList(UserAccount user, + String name) throws FavoriteListAlreadyExistException, UserNotFoundException { + + Preconditions.checkNotNull(user); + Preconditions.checkNotNull(name); + + // can't accept favorite list without name + Preconditions.checkArgument(StringUtils.isNotEmpty(name)); + try { + + UserAccountDAO userDAO = + PollenDAOHelper.getUserAccountDAO(getTransaction()); + + UserAccount userToUse = + userDAO.findByTopiaId(user.getTopiaId()); + + if (userToUse == null) { + throw new UserNotFoundException(); + } + + PersonListDAO dao = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + // check list does not already exists + + TopiaQuery query = dao.createQuery("e"); + + query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user); + query.addWhere("e." + PersonList.PROPERTY_NAME, TopiaQuery.Op.EQ, name); + + boolean exist = dao.existByQuery(query); + + if (exist) { + + throw new FavoriteListAlreadyExistException(); + } + + PersonList favoriteListCreated = dao.create( + PersonList.PROPERTY_OWNER, userToUse + ); + favoriteListCreated.setName(name); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public PersonList deleteFavoriteList(UserAccount user, + PersonList favoriteList) throws FavoriteListNotFoundException, FavoriteListNotOwnedByUserException, UserNotFoundException { + try { + + Preconditions.checkNotNull(user); + Preconditions.checkNotNull(favoriteList); + + UserAccountDAO userDAO = + PollenDAOHelper.getUserAccountDAO(getTransaction()); + + UserAccount userToUse = + userDAO.findByTopiaId(user.getTopiaId()); + + if (userToUse == null) { + throw new UserNotFoundException(); + } + + PersonListDAO dao = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + PersonList favoriteListToDelete = + dao.findByTopiaId(favoriteList.getTopiaId()); + + if (favoriteListToDelete == null) { + throw new FavoriteListNotFoundException(); + } + + // check this favorite belongs to the given user + UserAccount favoriteListOwner = favoriteListToDelete.getOwner(); + if (!favoriteListOwner.equals(user)) { + throw new FavoriteListNotOwnedByUserException(); + } + + dao.delete(favoriteListToDelete); + return favoriteListToDelete; + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void addPollAccountToFavoriteList(PersonList favoriteList, + PollAccount pollAccount) throws ParticipantAlreadyFoundInListException, FavoriteListNotFoundException { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pollAccount); + + // can't accept poll account without name + Preconditions.checkArgument( + StringUtils.isNotEmpty(pollAccount.getVotingId())); + + // can't accept poll account without email + Preconditions.checkArgument( + StringUtils.isNotEmpty(pollAccount.getEmail())); + + try { + + PersonListDAO personListDAO = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + PersonList personListToUpdate = + personListDAO.findByTopiaId(favoriteList.getTopiaId()); + + if (personListToUpdate == null) { + throw new FavoriteListNotFoundException(); + } + + PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(getTransaction()); + + // check there is other poll account in this list with same id + TopiaQuery query = dao.createQuery("e"); + query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate); + query.addWhere("e." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, pollAccount.getVotingId()); + boolean pollAccountExists = dao.existByQuery(query); + if (pollAccountExists) { + + throw new ParticipantAlreadyFoundInListException(); + } + + PollAccount pollAccountCreated = + dao.create(PollAccount.PROPERTY_PERSON_LIST, + personListToUpdate); + + pollAccountCreated.setVotingId(pollAccount.getVotingId()); + pollAccountCreated.setEmail(pollAccount.getEmail()); + personListToUpdate.addPollAccount(pollAccountCreated); + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void editPollAccountToFavoriteList(PersonList favoriteList, + PollAccount pollAccount) throws ParticipantAlreadyFoundInListException, FavoriteListNotFoundException, ParticipantNotFoundException { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pollAccount); + + // can't accept poll account without name + Preconditions.checkArgument( + StringUtils.isNotEmpty(pollAccount.getVotingId())); + + // can't accept poll account without email + Preconditions.checkArgument( + StringUtils.isNotEmpty(pollAccount.getEmail())); + + try { + + PersonListDAO personListDAO = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + PersonList personListToUpdate = + personListDAO.findByTopiaId(favoriteList.getTopiaId()); + + if (personListToUpdate == null) { + throw new FavoriteListNotFoundException(); + } + + PollAccountDAO dao = + PollenDAOHelper.getPollAccountDAO(getTransaction()); + + + PollAccount pollAccountToUpdate = + dao.findByTopiaId(pollAccount.getTopiaId()); + + if (pollAccountToUpdate == null) { + throw new ParticipantNotFoundException(); + } + + // check there is another poll account in this list with same id + TopiaQuery query = dao.createQuery("e"); + query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate); + query.addWhere("e." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, pollAccount.getVotingId()); + query.addWhere("e." + PollAccount.TOPIA_ID, TopiaQuery.Op.NEQ, pollAccount.getTopiaId()); + boolean pollAccountExists = dao.existByQuery(query); + if (pollAccountExists) { + + throw new ParticipantAlreadyFoundInListException(); + } + + pollAccountToUpdate.setVotingId(pollAccount.getVotingId()); + pollAccountToUpdate.setEmail(pollAccount.getEmail()); + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void removePollAccountToFavoriteList(PersonList favoriteList, + PollAccount pollAccount) throws ParticipantNotFoundException, FavoriteListNotFoundException, ParticipantNotFoundInListException { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pollAccount); + + try { + + PersonListDAO personListDAO = + PollenDAOHelper.getPersonListDAO(getTransaction()); + + PersonList personListToUpdate = + personListDAO.findByTopiaId(favoriteList.getTopiaId()); + + if (personListToUpdate == null) { + throw new FavoriteListNotFoundException(); + } + + PollAccountDAO dao = + PollenDAOHelper.getPollAccountDAO(getTransaction()); + + PollAccount pollAccountToRemove = + dao.findByTopiaId(pollAccount.getTopiaId()); + + if (pollAccountToRemove == null) { + + throw new ParticipantNotFoundException(); + } + + PollAccount pollAccountInList = + personListToUpdate.getPollAccountByTopiaId(pollAccount.getTopiaId()); + + if (pollAccountInList == null) { + + throw new ParticipantNotFoundInListException(); + } + + personListToUpdate.removePollAccount(pollAccountToRemove); + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + public int getNbUsers() { try { UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); @@ -284,4 +626,13 @@ // Don't keep case for email destination.setEmail(StringUtils.lowerCase(source.getEmail())); } + + public PersonList newFavoriteList() { + PersonListImpl personList = new PersonListImpl(); + return personList; + } + + public PollAccount newPollAccountForFavoriteList() { + return new PollAccountImpl(); + } } Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -32,7 +32,7 @@ * Test {@link EmailService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class EmailServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -34,7 +34,7 @@ * Tests the {@link FavoriteService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ @Ignore public class FavoriteServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -34,7 +34,7 @@ * Tests the {@link PollService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ @Ignore public class PollServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -33,7 +33,7 @@ * Tests the {@link UserService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ @Ignore public class UserServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -32,7 +32,7 @@ * Tests the {@link VoteService}. * * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 + * @since 1.2.6 */ public class VoteServiceTest extends AbstractPollenServiceTest { Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -28,6 +28,7 @@ import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserNotFoundException; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.ui.actions.PollenActionSupport; @@ -51,6 +52,18 @@ return user; } + public UserAccount getCreateUser() { + return getUser(); + } + + public UserAccount getEditUser() { + return getUser(); + } + + public UserAccount getDeleteUser() { + return getUser(); + } + public String getAction() { return action; } @@ -59,72 +72,87 @@ this.action = action; } - public String createUser() throws Exception { + public String create() throws Exception { Preconditions.checkNotNull(user); UserService service = newService(UserService.class); + String result = INPUT; try { service.createUser(user, true, getApplicationUrl()); getTransaction().commitTransaction(); addActionMessage( - _("pollen.information.user.created", user.getDisplayName())); + _("pollen.information.user.created", + user.getDisplayName())); // remove this user, otherwise it will be reused in the user lists user = null; action = null; - return SUCCESS; + result = SUCCESS; } catch (UserLoginAlreadyUsedException e) { - addFieldError("user.login", _("pollen.error.user.login.already.used")); + addFieldError("createUser.login", + _("pollen.error.user.login.already.used")); + } catch (UserEmailAlreadyUsedException e) { - addFieldError("user.email", _("pollen.error.user.email.already.used")); + addFieldError("createUser.email", + _("pollen.error.user.email.already.used")); } - return INPUT; + return result; } - public String updateUser() throws Exception { + public String edit() throws Exception { Preconditions.checkNotNull(user); UserService service = newService(UserService.class); + String result = INPUT; + try { service.updateUser(user, null, true); getTransaction().commitTransaction(); addActionMessage( - _("pollen.information.user.updated", user.getDisplayName())); + _("pollen.information.user.updated", + user.getDisplayName())); // remove this user, otherwise it will be reused in the user lists user = null; action = null; - return SUCCESS; + result = SUCCESS; } catch (UserEmailAlreadyUsedException e) { - addFieldError("user.email", _("pollen.error.user.email.already.used")); + addFieldError("editUser.email", + _("pollen.error.user.email.already.used")); } catch (UserInvalidPasswordException e) { - addFieldError("user.password", _("pollen.error.user.invalid.password")); + addFieldError("editUser.password", + _("pollen.error.user.invalid.password")); } - return INPUT; + return result; } - public String deleteUser() throws Exception { + public String delete() throws Exception { Preconditions.checkNotNull(user); UserService service = newService(UserService.class); - service.deleteUser(user.getLogin()); - getTransaction().commitTransaction(); + String result = INPUT; - addActionMessage( - _("pollen.information.user.deleted", user.getDisplayName())); + try { + service.deleteUser(user.getTopiaId()); + getTransaction().commitTransaction(); + addActionMessage( + _("pollen.information.user.deleted", user.getDisplayName())); - // remove this user, otherwise it will be reused in the user lists - user = null; - action = null; - return SUCCESS; + // remove this user, otherwise it will be reused in the user lists + user = null; + action = null; + result = SUCCESS; + } catch (UserNotFoundException e) { + addFieldError("deleteUser.login", + _("pollen.error.user.not.found")); + } + return result; } - - } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -26,8 +26,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.json.JSONException; import org.apache.struts2.json.JSONUtil; +import org.chorem.pollen.services.PollenPagerBean; import org.chorem.pollen.ui.actions.PollenActionSupport; -import org.nuiton.util.PagerUtil; /** * Abstract JSON action with pagination support. @@ -47,14 +47,14 @@ public abstract Integer getRecords(); - protected PagerUtil.PagerBean pager = PagerUtil.newPagerBean(); + protected PollenPagerBean pager = new PollenPagerBean(); - // sorting order - asc or desc - protected String sord; +// // sorting order - asc or desc +// protected String sord; +// +// // get index row - i.e. user click to sort. +// protected String sidx; - // get index row - i.e. user click to sort. - protected String sidx; - protected String filters; public void setRows(Integer rows) { @@ -65,20 +65,22 @@ pager.setPageIndex(page); } - public String getSord() { - return sord; - } +// public String getSord() { +// return sord; +// } public void setSord(String sord) { - this.sord = sord; + pager.setSortAscendant("asc".equals(sord)); +// this.sord = sord; } public String getSidx() { - return sidx; + return pager.getSortColumn(); } public void setSidx(String sidx) { - this.sidx = sidx; + pager.setSortColumn(sidx); +// this.sidx = sidx; } public String getFilters() { @@ -89,25 +91,25 @@ this.filters = filters; } - protected String getSortColumn() { - String result = null; - if (useSort()) { - result = sidx; - } - return result; - } +// protected String getSortColumn() { +// String result = null; +// if (useSort()) { +// result = sidx; +// } +// return result; +// } - protected boolean isSortAscendant() { - boolean result = false; - if (useSort()) { - result = "asc".equals(sord); - } - return result; - } +// protected boolean isSortAscendant() { +// boolean result = false; +// if (useSort()) { +// result = "asc".equals(sord); +// } +// return result; +// } - protected boolean useSort() { - return StringUtils.isNotEmpty(sidx); - } +// protected boolean useSort() { +// return StringUtils.isNotEmpty(sidx); +// } protected Object getFilterObject() throws JSONException { Object filterObject = null; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -74,12 +74,7 @@ PollService pollService = newService(PollService.class); - boolean ascendantOrder = isSortAscendant(); - String sortColumn = getSortColumn(); - List<Poll> pollList = pollService.getCreatedPolls(pager, - sortColumn, - ascendantOrder, getPollenSession().getUserAccount()); polls = new Map[pollList.size()]; Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,73 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import com.google.common.collect.Maps; +import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import java.util.Map; + +/** + * Get given favorite list. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetFavoriteList extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + private String favoriteListId; + + private transient Map<String, Object> favoriteList; + + public String getFavoriteListId() { + return favoriteListId; + } + + public void setFavoriteListId(String favoriteListId) { + this.favoriteListId = favoriteListId; + } + + public Map<String, Object> getFavoriteList() { + return favoriteList; + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + PersonList personList = + userService.getEntityById(PersonList.class, favoriteListId); + + favoriteList = Maps.newHashMap(); + favoriteList.put("id", personList.getTopiaId()); + favoriteList.put(PersonList.PROPERTY_NAME, personList.getName()); + + return SUCCESS; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,79 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.beans.Binder; + +import java.util.Map; + +/** + * Get pagined list of poll accounts of a given favorite list. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetFavoriteListPollAccount extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + private String pollAccountId; + + private transient Map<String, Object> pollAccount; + + public String getPollAccountId() { + return pollAccountId; + } + + public void setPollAccountId(String pollAccountId) { + this.pollAccountId = pollAccountId; + } + + public Map<String, Object> getPollAccount() { + return pollAccount; + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + PollAccount userAccount = + userService.getEntityById(PollAccount.class, pollAccountId); + + Binder<PollAccount, PollAccount> binder = + PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class); + pollAccount = binder.obtainProperties( + userAccount, + PollAccount.PROPERTY_VOTING_ID, + PollAccount.PROPERTY_EMAIL + ); + pollAccount.put("id", userAccount.getTopiaId()); + + return SUCCESS; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,109 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.services.impl.UserService; +import org.nuiton.util.beans.Binder; + +import java.util.List; +import java.util.Map; + +/** + * Get pagined list of poll accounts of a given favorite list. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetFavoriteListPollAccounts extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] pollAccounts; + + protected String favoriteListId; + + public Map<String, Object>[] getPollAccounts() { + return pollAccounts; + } + + public String getFavoriteListId() { + return favoriteListId; + } + + public void setFavoriteListId(String favoriteListId) { + this.favoriteListId = favoriteListId; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + PersonList favoriteList = + userService.getEntityById(PersonList.class, favoriteListId); + + List<PollAccount> allPollAccounts = userService.getFavoriteListUsers( + favoriteList, + pager); + + pollAccounts = new Map[allPollAccounts.size()]; + Binder<PollAccount, PollAccount> binder = + PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class); + int index = 0; + for (PollAccount pollAccount : allPollAccounts) { + Map<String, Object> map = binder.obtainProperties( + pollAccount, + PollAccount.PROPERTY_VOTING_ID, + PollAccount.PROPERTY_EMAIL + ); + map.put("id", pollAccount.getTopiaId()); + pollAccounts[index++] = map; + } + + return SUCCESS; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,90 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import com.google.common.collect.Maps; +import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.services.impl.UserService; + +import java.util.List; +import java.util.Map; + +/** + * Get pagined list of favorite lists of the connected user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetFavoriteLists extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] favoriteLists; + + public Map<String, Object>[] getFavoriteLists() { + return favoriteLists; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + List<PersonList> allFavoriteLists = userService.getFavoriteLists( + getPollenSession().getUserAccount(), + pager); + + favoriteLists = new Map[allFavoriteLists.size()]; + int index = 0; + for (PersonList favoriteList : allFavoriteLists) { + Map<String, Object> map = Maps.newHashMap(); + map.put(PersonList.PROPERTY_NAME, favoriteList.getName()); + map.put("id", favoriteList.getTopiaId()); + map.put("nbAccounts", favoriteList.sizePollAccount()); + favoriteLists[index++] = map; + } + + return SUCCESS; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -77,12 +77,7 @@ PollService pollService = newService(PollService.class); - boolean ascendantOrder = isSortAscendant(); - String sortColumn = getSortColumn(); - List<Poll> pollList = pollService.getInvitedPolls(pager, - sortColumn, - ascendantOrder, getPollenSession().getUserAccount()); polls = new Map[pollList.size()]; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -74,14 +74,9 @@ PollService pollService = newService(PollService.class); - boolean ascendantOrder = isSortAscendant(); - String sortColumn = getSortColumn(); + List<Poll> pollList = pollService.getParticipatedPolls( + pager, getPollenSession().getUserAccount()); - List<Poll> pollList = pollService.getParticipatedPolls(pager, - sortColumn, - ascendantOrder, - getPollenSession().getUserAccount()); - polls = new Map[pollList.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -74,13 +74,8 @@ PollService pollService = newService(PollService.class); - boolean ascendantOrder = isSortAscendant(); - String sortColumn = getSortColumn(); + List<Poll> pollList = pollService.getPolls(pager); - List<Poll> pollList = pollService.getPolls(pager, - sortColumn, - ascendantOrder); - polls = new Map[pollList.size()]; Binder<Poll, Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -38,6 +38,7 @@ * @since 2.0 */ public class GetUser extends PollenActionSupport { + private static final long serialVersionUID = 1L; private String userId; Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -72,13 +72,8 @@ UserService userService = newService(UserService.class); - boolean ascendantOrder = isSortAscendant(); - String sortColumn = getSortColumn(); + List<UserAccount> allUsers = userService.getUsers(pager); - List<UserAccount> allUsers = userService.getUsers(pager, - sortColumn, - ascendantOrder); - users = new Map[allUsers.size()]; Binder<UserAccount, UserAccount> binder = PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,38 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Creates a new poll by cloning an existing one. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class Clone extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Closes an existing poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class Close extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,164 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import com.google.common.collect.Maps; +import com.opensymphony.xwork2.Preparable; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.I18nAble; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; +import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import java.util.Map; + +/** + * Creates a new poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Create extends PollenActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + protected Poll poll; + + protected Map<Integer, String> pollTypes; + + protected Map<Integer, String> voteCountingTypes; + + protected Map<Integer, String> choiceTypes; + + protected boolean notification; + + protected boolean reminder; + + protected boolean limitChoice; + + protected int reminderHourCountdown; + + protected int notificationNumber; + + public String getPageLogo() { + return "Creation"; + } + + public Poll getPoll() { + if (poll == null) { + UserAccount userAccount = getPollenSession().getUserAccount(); + poll = newService(PollService.class).getNewPoll(userAccount); + } + return poll; + } + + public Map<Integer, String> getPollTypes() { + return pollTypes; + } + + public Map<Integer, String> getVoteCountingTypes() { + return voteCountingTypes; + } + + public Map<Integer, String> getChoiceTypes() { + return choiceTypes; + } + + public boolean isNotification() { + return notification; + } + + public void setNotification(boolean notification) { + this.notification = notification; + } + + public boolean isReminder() { + return reminder; + } + + public void setReminder(boolean reminder) { + this.reminder = reminder; + } + + public boolean isLimitChoice() { + return limitChoice; + } + + public void setLimitChoice(boolean limitChoice) { + this.limitChoice = limitChoice; + } + + public int getReminderHourCountdown() { + return reminderHourCountdown; + } + + public void setReminderHourCountdown(int reminderHourCountdown) { + this.reminderHourCountdown = reminderHourCountdown; + } + + public int getNotificationNumber() { + return notificationNumber; + } + + public void setNotificationNumber(int notificationNumber) { + this.notificationNumber = notificationNumber; + } + + @Override + public String execute() throws Exception { + + PollService service = newService(PollService.class); + +// try { +// Poll basicPoll = service.createBasicPoll(poll); +// +// return SUCCESS; +// } catch (TopiaException e) { +// +// } + + // back to input + return INPUT; + } + + @Override + public void prepare() throws Exception { + + pollTypes = decorate(PollType.values()); + choiceTypes = decorate(ChoiceType.values()); + voteCountingTypes = decorate(VoteCountingType.values()); + + } + + private <E extends Enum<E> & I18nAble> Map<Integer, String> decorate(E... values) { + Map<Integer, String> result = Maps.newLinkedHashMap(); + for (E value : values) { + result.put(value.ordinal(), getText(value.getI18nKey())); + } + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,164 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import com.google.common.collect.Maps; -import com.opensymphony.xwork2.Preparable; -import org.chorem.pollen.business.persistence.Poll; -import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.I18nAble; -import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; -import org.chorem.pollen.services.impl.PollService; -import org.chorem.pollen.ui.actions.PollenActionSupport; - -import java.util.Map; - -/** - * Creates a new poll. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class CreatePoll extends PollenActionSupport implements Preparable { - - private static final long serialVersionUID = 1L; - - protected Poll poll; - - protected Map<Integer, String> pollTypes; - - protected Map<Integer, String> voteCountingTypes; - - protected Map<Integer, String> choiceTypes; - - protected boolean notification; - - protected boolean reminder; - - protected boolean limitChoice; - - protected int reminderHourCountdown; - - protected int notificationNumber; - - public String getPageLogo() { - return "Creation"; - } - - public Poll getPoll() { - if (poll == null) { - UserAccount userAccount = getPollenSession().getUserAccount(); - poll = newService(PollService.class).getNewPoll(userAccount); - } - return poll; - } - - public Map<Integer, String> getPollTypes() { - return pollTypes; - } - - public Map<Integer, String> getVoteCountingTypes() { - return voteCountingTypes; - } - - public Map<Integer, String> getChoiceTypes() { - return choiceTypes; - } - - public boolean isNotification() { - return notification; - } - - public void setNotification(boolean notification) { - this.notification = notification; - } - - public boolean isReminder() { - return reminder; - } - - public void setReminder(boolean reminder) { - this.reminder = reminder; - } - - public boolean isLimitChoice() { - return limitChoice; - } - - public void setLimitChoice(boolean limitChoice) { - this.limitChoice = limitChoice; - } - - public int getReminderHourCountdown() { - return reminderHourCountdown; - } - - public void setReminderHourCountdown(int reminderHourCountdown) { - this.reminderHourCountdown = reminderHourCountdown; - } - - public int getNotificationNumber() { - return notificationNumber; - } - - public void setNotificationNumber(int notificationNumber) { - this.notificationNumber = notificationNumber; - } - - @Override - public String execute() throws Exception { - - PollService service = newService(PollService.class); - -// try { -// Poll basicPoll = service.createBasicPoll(poll); -// -// return SUCCESS; -// } catch (TopiaException e) { -// -// } - - // back to input - return INPUT; - } - - @Override - public void prepare() throws Exception { - - pollTypes = decorate(PollType.values()); - choiceTypes = decorate(ChoiceType.values()); - voteCountingTypes = decorate(VoteCountingType.values()); - - } - - private <E extends Enum<E> & I18nAble> Map<Integer, String> decorate(E... values) { - Map<Integer, String> result = Maps.newLinkedHashMap(); - for (E value : values) { - result.put(value.ordinal(), getText(value.getI18nKey())); - } - return result; - } -} Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,42 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display list of created polls. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class CreatedList extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + @Override + public String getPageLogo() { + return "Creation"; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Deletes an existing poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class Delete extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,42 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Display list of created polls. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class DisplayCreatedPolls extends PollenActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String getPageLogo() { - return "Creation"; - } -} Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,42 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Display list of participated polls. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class DisplayParticipatedPolls extends PollenActionSupport { - - private static final long serialVersionUID = 1L; - - @Override - public String getPageLogo() { - return "Vote"; - } -} Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,37 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Display a poll. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class DisplayPoll extends PollenActionSupport { - - private static final long serialVersionUID = 1L; -} Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,37 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.poll; - -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Display results of a poll. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class DisplayPollResult extends PollenActionSupport { - - private static final long serialVersionUID = 1L; -} Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Edit extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Exports an existing poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class Export extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,42 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display list of participated polls. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ParticipatedList extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + @Override + public String getPageLogo() { + return "Vote"; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display results of a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Result extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Votes to a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class Vote extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,115 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Update a user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Edit extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected UserAccount user; + + protected String newPassword; + + protected String newPassword2; + + public String getPageLogo() { + return "Creation"; + } + + public UserAccount getUser() { + if (user == null) { + UserService service = newService(UserService.class); + user = service.getNewUser(); + } + return user; + } + + public String getNewPassword() { + return newPassword; + } + + public void setNewPassword(String newPassword) { + this.newPassword = newPassword; + } + + public String getNewPassword2() { + return newPassword2; + } + + public void setNewPassword2(String newPassword2) { + this.newPassword2 = newPassword2; + } + + public String input() throws Exception { + UserAccount userAccount = getPollenSession().getUserAccount(); + UserService userService = newService(UserService.class); + user = userService.getEntityById(UserAccount.class, userAccount.getTopiaId()); + return INPUT; + } + + @Override + public String execute() throws Exception { + + // let's push back admin property to user to save + user.setAdministrator( + getPollenSession().getUserAccount().isAdministrator()); + + UserService service = newService(UserService.class); + + try { + UserAccount updatedUser = + service.updateUser(user, newPassword, false); + getTransaction().commitTransaction(); + + // push back user to session + getPollenSession().setUserAccount(updatedUser); + return SUCCESS; + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } catch (UserInvalidPasswordException e) { + addFieldError("user.password", _("pollen.error.user.invalid.password")); + } + + // if error go back to input + + // reset password + user.setPassword(null); + newPassword = newPassword2 = null; + + return INPUT; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,195 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import com.google.common.base.Preconditions; +import com.opensymphony.xwork2.Preparable; +import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException; +import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException; +import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Manage a selected favorite lists of a connected user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class ManageFavoriteList extends PollenActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + @Override + public String getPageLogo() { + return "Creation"; + } + + protected String action; + + protected String favoriteListId; + + protected PersonList favoriteList; + + protected PollAccount pollAccount; + + public PollAccount getCreatePollAccount() { + return getPollAccount(); + } + + public PollAccount getEditPollAccount() { + return getPollAccount(); + } + + public PollAccount getDeletePollAccount() { + return getPollAccount(); + } + + public PersonList getFavoriteList() { + return favoriteList; + } + + public String getFavoriteListId() { + return favoriteListId; + } + + public void setFavoriteListId(String favoriteListId) { + this.favoriteListId = favoriteListId; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + @Override + public void prepare() throws Exception { + + Preconditions.checkNotNull(favoriteListId); + + UserService userService = newService(UserService.class); + + try { + favoriteList = userService.getFavoriteList( + getPollenSession().getUserAccount(), favoriteListId); + } catch (FavoriteListNotFoundException e) { + addActionError(_("pollen.error.favoriteList.not.found")); + } catch (FavoriteListNotOwnedByUserException e) { + addActionError(_("pollen.error.favoriteList.not.owned.by.user")); + } + } + + public String create() throws Exception { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pollAccount); + + String result = INPUT; + + + UserService userService = newService(UserService.class); + + try { + + userService.addPollAccountToFavoriteList(favoriteList, pollAccount); + getTransaction().commitTransaction(); + + addActionMessage( + _("pollen.information.pollAccount.addedTofavoriteList", + pollAccount.getVotingId())); + + pollAccount = null; + action = null; + result = SUCCESS; + } catch (ParticipantAlreadyFoundInListException e) { + addFieldError("createPollAccount.votingId", + _("pollen.error.favoriteList.participant.already.found.in.list")); + } + return result; + } + + public String edit() throws Exception { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pollAccount); + + String result = INPUT; + + + UserService userService = newService(UserService.class); + + try { + + userService.editPollAccountToFavoriteList(favoriteList, pollAccount); + getTransaction().commitTransaction(); + + addActionMessage( + _("pollen.information.pollAccount.updatedTofavoriteList", + pollAccount.getVotingId())); + + pollAccount = null; + action = null; + result = SUCCESS; + } catch (ParticipantAlreadyFoundInListException e) { + addFieldError("editPollAccount.votingId", + _("pollen.error.favoriteList.participant.already.found.in.list")); + } + return result; + } + + public String delete() throws Exception { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(pollAccount); + Preconditions.checkNotNull(pollAccount.getTopiaId()); + + UserService userService = newService(UserService.class); + + userService.removePollAccountToFavoriteList(favoriteList, pollAccount); + getTransaction().commitTransaction(); + + addActionMessage( + _("pollen.information.pollAccount.removedFromFavoriteList", + pollAccount.getVotingId())); + + action = null; + pollAccount = null; + + return SUCCESS; + } + + protected PollAccount getPollAccount() { + if (pollAccount == null) { + UserService userService = newService(UserService.class); + pollAccount = userService.newPollAccountForFavoriteList(); + } + return pollAccount; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,144 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import java.io.File; + +/** + * Manage favorite lists of a connected user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class ManageFavoriteLists extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected PersonList favoriteList; + + protected File csvImport; + + protected String csvImportContentType; + + protected String csvImportFileName; + + protected String ldapImport; + + protected String action; + + public void setCsvImport(File csvImport) { + this.csvImport = csvImport; + } + + public void setCsvImportContentType(String csvImportContentType) { + this.csvImportContentType = csvImportContentType; + } + + public void setCsvImportFileName(String csvImportFileName) { + this.csvImportFileName = csvImportFileName; + } + + public String getLdapImport() { + return ldapImport; + } + + public void setLdapImport(String ldapImport) { + this.ldapImport = ldapImport; + } + + public PersonList getCreateFavoriteList() { + return getFavoriteList(); + } + + public PersonList getDeleteFavoriteList() { + return getFavoriteList(); + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + @Override + public String getPageLogo() { + return "Creation"; + } + + public String create() throws Exception { + + Preconditions.checkNotNull(favoriteList); + Preconditions.checkNotNull(favoriteList.getName()); + + String result = INPUT; + UserService userService = newService(UserService.class); + try { + userService.createFavoriteList(getPollenSession().getUserAccount(), + favoriteList.getName()); + getTransaction().commitTransaction(); + + addActionMessage(_("pollen.information.favoriteList.created", + favoriteList.getName())); + action = null; + favoriteList = null; + result = SUCCESS; + } catch (FavoriteListAlreadyExistException e) { + addFieldError("createFavoriteList.name", + _("pollen.error.favoriteList.already.used")); + } + return result; + } + + public String delete() throws Exception { + + Preconditions.checkNotNull(favoriteList); + + UserService userService = newService(UserService.class); + + PersonList deletedFavoritedList = userService.deleteFavoriteList(getPollenSession().getUserAccount(), + favoriteList); + getTransaction().commitTransaction(); + + addActionMessage(_("pollen.information.favoriteList.deleted", + deletedFavoritedList.getName())); + action = null; + favoriteList = null; + return SUCCESS; + } + + protected PersonList getFavoriteList() { + if (favoriteList == null) { + favoriteList = newService(UserService.class).newFavoriteList(); + } + return favoriteList; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,92 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Register a new user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Register extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected UserAccount user; + + protected String password2; + + public UserAccount getUser() { + if (user == null) { + UserService service = newService(UserService.class); + user = service.getNewUser(); + } + return user; + } + + public String getPassword2() { + return password2; + } + + public void setPassword2(String password2) { + this.password2 = password2; + } + + public String getPageLogo() { + return "Creation"; + } + + @Override + public String execute() throws Exception { + + UserService service = newService(UserService.class); + + try { + UserAccount createdUser = service.createUser(user, false, getApplicationUrl()); + getTransaction().commitTransaction(); + + getPollenSession().setUserAccount(createdUser); + addActionMessage(_("pollen.information.your.are.loggued")); + return SUCCESS; + } catch (UserLoginAlreadyUsedException e) { + addFieldError("user.login", _("pollen.error.user.login.already.used")); + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } + + // if error go back to input + + // reset password + user.setPassword(null); + password2 = null; + + return INPUT; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,92 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.user; - -import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; -import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; -import org.chorem.pollen.services.impl.UserService; -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Register a new user. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class RegisterUser extends PollenActionSupport { - - private static final long serialVersionUID = 1L; - - protected UserAccount user; - - protected String password2; - - public UserAccount getUser() { - if (user == null) { - UserService service = newService(UserService.class); - user = service.getNewUser(); - } - return user; - } - - public String getPassword2() { - return password2; - } - - public void setPassword2(String password2) { - this.password2 = password2; - } - - public String getPageLogo() { - return "Creation"; - } - - @Override - public String execute() throws Exception { - - UserService service = newService(UserService.class); - - try { - UserAccount createdUser = service.createUser(user, false, getApplicationUrl()); - getTransaction().commitTransaction(); - - getPollenSession().setUserAccount(createdUser); - addActionMessage(_("pollen.information.your.are.loggued")); - return SUCCESS; - } catch (UserLoginAlreadyUsedException e) { - addFieldError("user.login", _("pollen.error.user.login.already.used")); - } catch (UserEmailAlreadyUsedException e) { - addFieldError("user.email", _("pollen.error.user.email.already.used")); - } - - // if error go back to input - - // reset password - user.setPassword(null); - password2 = null; - - return INPUT; - } -} Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,47 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Show user account. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Show extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public String getPageLogo() { + return "Creation"; + } + + public UserAccount getUser() { + return getPollenSession().getUserAccount(); + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,47 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.user; - -import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Show user account. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class ShowUser extends PollenActionSupport { - - private static final long serialVersionUID = 1L; - - public String getPageLogo() { - return "Creation"; - } - - public UserAccount getUser() { - return getPollenSession().getUserAccount(); - } - -} Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,115 +0,0 @@ -/* - * #%L - * Pollen :: UI (strust2) - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.actions.user; - -import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; -import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; -import org.chorem.pollen.services.impl.UserService; -import org.chorem.pollen.ui.actions.PollenActionSupport; - -/** - * Update a user. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 2.0 - */ -public class UpdateUser extends PollenActionSupport { - - private static final long serialVersionUID = 1L; - - protected UserAccount user; - - protected String newPassword; - - protected String newPassword2; - - public String getPageLogo() { - return "Creation"; - } - - public UserAccount getUser() { - if (user == null) { - UserService service = newService(UserService.class); - user = service.getNewUser(); - } - return user; - } - - public String getNewPassword() { - return newPassword; - } - - public void setNewPassword(String newPassword) { - this.newPassword = newPassword; - } - - public String getNewPassword2() { - return newPassword2; - } - - public void setNewPassword2(String newPassword2) { - this.newPassword2 = newPassword2; - } - - public String input() throws Exception { - UserAccount userAccount = getPollenSession().getUserAccount(); - UserService userService = newService(UserService.class); - user = userService.getEntityById(UserAccount.class, userAccount.getTopiaId()); - return INPUT; - } - - @Override - public String execute() throws Exception { - - // let's push back admin property to user to save - user.setAdministrator( - getPollenSession().getUserAccount().isAdministrator()); - - UserService service = newService(UserService.class); - - try { - UserAccount updatedUser = - service.updateUser(user, newPassword, false); - getTransaction().commitTransaction(); - - // push back user to session - getPollenSession().setUserAccount(updatedUser); - return SUCCESS; - } catch (UserEmailAlreadyUsedException e) { - addFieldError("user.email", _("pollen.error.user.email.already.used")); - } catch (UserInvalidPasswordException e) { - addFieldError("user.password", _("pollen.error.user.invalid.password")); - } - - // if error go back to input - - // reset password - user.setPassword(null); - newPassword = newPassword2 = null; - - return INPUT; - } - -} Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -37,12 +37,11 @@  <action name="usersList" method="input" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> -  <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> </action>  - <action name="createUser" method="createUser" + <action name="create" method="create" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> @@ -50,7 +49,7 @@ </action>  - <action name="updateUser" method="updateUser" + <action name="edit" method="edit" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> @@ -58,7 +57,7 @@ </action>  - <action name="deleteUser" method="deleteUser" + <action name="delete" method="delete" class="org.chorem.pollen.ui.actions.admin.ManageUsers"> <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> @@ -68,7 +67,6 @@  <action name="pollsList" method="input" class="org.chorem.pollen.ui.actions.admin.ManagePolls"> -  <result name="input">/WEB-INF/jsp/admin/pollsList.jsp</result> </action> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -45,6 +45,34 @@ <result type="json"/> </action> +  + <action name="getFavoriteLists" + class="org.chorem.pollen.ui.actions.json.GetFavoriteLists"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> + +  + <action name="getFavoriteList" + class="org.chorem.pollen.ui.actions.json.GetFavoriteList"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> + +  + <action name="getFavoriteListPollAccounts" + class="org.chorem.pollen.ui.actions.json.GetFavoriteListPollAccounts"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> + +  + <action name="getFavoriteListPollAccount" + class="org.chorem.pollen.ui.actions.json.GetFavoriteListPollAccount"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> +  <action name="getPolls" class="org.chorem.pollen.ui.actions.json.GetPolls"> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -33,37 +33,72 @@ <package name="poll" extends="default" namespace="/poll">  - <action name="createPoll" - class="org.chorem.pollen.ui.actions.poll.CreatePoll"> - <result name="input">/WEB-INF/jsp/poll/createPoll.jsp</result> + <action name="create" + class="org.chorem.pollen.ui.actions.poll.Create"> + <result name="input">/WEB-INF/jsp/poll/create.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> -  - <action name="displayPoll" - class="org.chorem.pollen.ui.actions.poll.DisplayPoll"> - <result name="input">/WEB-INF/jsp/poll.jsp</result> +  + <action name="edit" + class="org.chorem.pollen.ui.actions.poll.Edit"> + <result name="input">/WEB-INF/jsp/poll/edit.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> +  + <action name="vote" + class="org.chorem.pollen.ui.actions.poll.Vote"> + <result name="input">/WEB-INF/jsp/poll/vote.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="clone" + class="org.chorem.pollen.ui.actions.poll.Clone"> + <result name="input">/WEB-INF/jsp/poll/clone.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="export" + class="org.chorem.pollen.ui.actions.poll.Export"> + <result name="input">/WEB-INF/jsp/poll/export.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="close" + class="org.chorem.pollen.ui.actions.poll.Close"> + <result name="input">/WEB-INF/jsp/poll/close.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="delete" + class="org.chorem.pollen.ui.actions.poll.Delete"> + <result name="input">/WEB-INF/jsp/poll/delete.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> +  - <action name="displayPollResult" - class="org.chorem.pollen.ui.actions.poll.DisplayPollResult"> - <result name="input">/WEB-INF/jsp/pollResult.jsp</result> + <action name="result" + class="org.chorem.pollen.ui.actions.poll.Result"> + <result name="input">/WEB-INF/jsp/poll/result.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action>  - <action name="displayCreatedPolls" - class="org.chorem.pollen.ui.actions.poll.DisplayCreatedPolls"> + <action name="createdList" + class="org.chorem.pollen.ui.actions.poll.CreatedList"> <interceptor-ref name="pollenBasicLogguedStack"/> <result name="input">/WEB-INF/jsp/poll/createdList.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action>  - <action name="displayParticipatedPolls" - class="org.chorem.pollen.ui.actions.poll.DisplayParticipatedPolls"> + <action name="participatedList" + class="org.chorem.pollen.ui.actions.poll.ParticipatedList"> <interceptor-ref name="pollenBasicLogguedStack"/> <result name="input">/WEB-INF/jsp/poll/participatedList.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -39,24 +39,21 @@ </action>  - <action name="registerUser" - class="org.chorem.pollen.ui.actions.user.RegisterUser"> - <result name="input">/WEB-INF/jsp/user/registerUser.jsp</result> + <action name="register" class="org.chorem.pollen.ui.actions.user.Register"> + <result name="input">/WEB-INF/jsp/user/register.jsp</result> <result type="redirectToHome"/> </action>  - <action name="showUser" - class="org.chorem.pollen.ui.actions.user.ShowUser"> - <result>/WEB-INF/jsp/user/showUser.jsp</result> + <action name="show" class="org.chorem.pollen.ui.actions.user.Show"> + <result>/WEB-INF/jsp/user/show.jsp</result> </action> -  - <action name="updateUser" - class="org.chorem.pollen.ui.actions.user.UpdateUser"> - <result name="input">/WEB-INF/jsp/user/updateUser.jsp</result> +  + <action name="edit" class="org.chorem.pollen.ui.actions.user.Edit"> + <result name="input">/WEB-INF/jsp/user/edit.jsp</result> <result type="redirectAction"> - <param name="actionName">showUser</param> + <param name="actionName">show</param> <param name="namespace">/user</param> </result> </action> @@ -66,6 +63,61 @@ <result type="redirectToHome"/> </action> +  + <action name="favoriteLists" method="input" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteLists"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteLists.jsp</result> + <result>/WEB-INF/jsp/user/favoriteLists.jsp</result> + </action> + +  + <action name="createFavoriteList" method="create" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteLists"> + <interceptor-ref name="pollenParamsPrepareParamsLogguedStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteLists.jsp</result> + <result>/WEB-INF/jsp/user/favoriteLists.jsp</result> + </action> + +  + <action name="deleteFavoriteList" method="delete" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteLists"> + <interceptor-ref name="pollenParamsPrepareParamsLogguedStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteLists.jsp</result> + <result>/WEB-INF/jsp/user/favoriteLists.jsp</result> + </action> + +  + <action name="editFavoriteList" method="input" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteList"> + <interceptor-ref name="pollenParamsPrepareParamsLogguedStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> + </action> + +  + <action name="addPollAccount" method="create" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteList"> + <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> + <result>/WEB-INF/jsp/user/favoriteList.jsp</result> + </action> + +  + <action name="editPollAccount" method="edit" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteList"> + <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> + <result>/WEB-INF/jsp/user/favoriteList.jsp</result> + </action> + +  + <action name="removePollAccount" method="delete" + class="org.chorem.pollen.ui.actions.user.ManageFavoriteList"> + <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> + <result name="input">/WEB-INF/jsp/user/favoriteList.jsp</result> + <result>/WEB-INF/jsp/user/favoriteList.jsp</result> + </action> + </package> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,9 +1,17 @@ poll.common.select.choiceType=Select the type of choice +poll.common.select.userFavoriteList=List +pollen.action.backToFavoriteLists=Back to favorite lists pollen.action.create=Create +pollen.action.createFavoriteList=Create a new list pollen.action.createPoll=Create the poll +pollen.action.createPollAccount=Add a new member pollen.action.createUser=Create a new user pollen.action.delete=Delete +pollen.action.deleteFavoriteList=Delete a list +pollen.action.deletePollAccount=Delete selected member pollen.action.deleteUser=Delete selected user +pollen.action.editFavoriteList=Edit a list +pollen.action.editPollAccount=Edit selected member pollen.action.editUser=Edit selected user pollen.action.login=Log me In pollen.action.modify=Modify @@ -21,6 +29,7 @@ pollen.common.beginChoiceDate=Begin choice date pollen.common.beginDate=Begin date pollen.common.bugReport=Bug report +pollen.common.csvImport=CSV import pollen.common.description=Description pollen.common.email=Em@il pollen.common.endChoiceDate=end choice date @@ -28,8 +37,11 @@ pollen.common.firstName=First name pollen.common.functions=Functions pollen.common.lastName=Last name +pollen.common.ldapImport=LDAP import pollen.common.license=Licence pollen.common.login=Login +pollen.common.name=Name +pollen.common.nbAccounts=Number of members pollen.common.newPassword=New password pollen.common.newPassword2=Reenter new passworsd pollen.common.or=or @@ -50,26 +62,46 @@ pollen.common.title=Title pollen.common.userSupport=User support pollen.common.voteCountingType=Counting type -pollen.error.email.required=You must provide a email +pollen.error.email.required=You must provide an email +pollen.error.favoriteList.already.used=List name already used +pollen.error.favoriteList.not.found=Favorite list not found +pollen.error.favoriteList.not.owned.by.user=You are not owner of this favorite list +pollen.error.favoriteList.participant.already.found.in.list=Member was same name already in favorite list +pollen.error.favoriteList.participant.not.found.in.list=Member not found in favorite list +pollen.error.favoriteListName.required=List name mandatory pollen.error.login.required=You must provide a login pollen.error.password.required=Your must provide a password pollen.error.password2.required=You must repeat your password for confirmation pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.pollAccount.email.required=Em@il mandatory +pollen.error.pollAccount.not.found=Poll account not found +pollen.error.pollAccount.votingId.required=Name mandatory pollen.error.user.bad.login.or.password=Login or password invalid. pollen.error.user.email.already.used=This email is already used pollen.error.user.invalid.password=Invalid password pollen.error.user.login.already.used=This login is already used -pollen.fieldset.connexionInformation=Information de connexion +pollen.error.user.not.found=User not found +pollen.fieldset.connexionInformation=Connexion informations pollen.fieldset.login=Login pollen.fieldset.poll.choices=Choices pollen.fieldset.poll.general=Your poll pollen.fieldset.poll.options=Options pollen.fieldset.poll.you=You +pollen.fieldset.pollAccount.toAddToFavoriteList=Add a new member +pollen.fieldset.pollAccount.toDeleteFromFavoriteList=Remove a member +pollen.fieldset.pollAccount.toEditToFavoriteList=Edit member +pollen.fieldset.userFavoriteList.toCreate=Create a new list +pollen.fieldset.userFavoriteList.toDelete=List de favoris à supprimer pollen.fieldset.userInformation=User information pollen.fieldset.userInformation.toCreate=User informations to create pollen.fieldset.userInformation.toDelete=User informations to delete pollen.fieldset.userInformation.toUpdate=User informations to update +pollen.information.favoriteList.created=Favorite list %s created. +pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.need.login=You must be logged to access this page. Please fill the form below. +pollen.information.pollAccount.addedTofavoriteList=Member '%s was added to favorite list. +pollen.information.pollAccount.removedFromFavoriteList=Member %s was removed from favorite list. +pollen.information.pollAccount.updatedTofavoriteList=Member %s was updated in favorite list. pollen.information.user.created=User %s created. pollen.information.user.deleted=User %s deleted. pollen.information.user.updated=User %s updated. @@ -78,18 +110,20 @@ pollen.legend.login=Login pollen.menu.admin=Administration pollen.menu.createPoll=Create a poll -pollen.menu.displayCreatedPolls=Created polls -pollen.menu.displayParticipatedPolls=Participated polls -pollen.menu.displayVotingLists=Voting lists pollen.menu.home=Home pollen.menu.login=Log in pollen.menu.logout=Log out pollen.menu.managePolls=Manage Polls pollen.menu.manageUsers=Manage Users pollen.menu.polls=Polls +pollen.menu.pollsCreatedList=Created polls +pollen.menu.pollsParticipatedList=Participated polls pollen.menu.preferences=My account pollen.menu.register=Register +pollen.menu.userFavoriteLists=Voting lists pollen.title.createPoll=New poll +pollen.title.editFavoriteList=Edition de la liste des favoris +pollen.title.favoriteLists=Vos listes de votants pollen.title.myAccount=My account pollen.title.pollsCreatedList=Polls created pollen.title.pollsCreatedList.legend=Polls you have proposed Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,9 +1,17 @@ poll.common.select.choiceType=Sélectionner le type de choix +poll.common.select.userFavoriteList=Liste +pollen.action.backToFavoriteLists=Retour à la liste des favoris pollen.action.create=Créer +pollen.action.createFavoriteList=Créer une ouvelle liste pollen.action.createPoll=Créer le sondage +pollen.action.createPollAccount=Ajouter une membre à la liste pollen.action.createUser=Créer un nouvel utilisateur pollen.action.delete=Supprimer +pollen.action.deleteFavoriteList=Supprimer une liste sélectionnée +pollen.action.deletePollAccount=Supprimer une membre de la liste pollen.action.deleteUser=Supprimer un utilisateur sélectionné +pollen.action.editFavoriteList=Editer une liste sélectionnée +pollen.action.editPollAccount=Editer le membre sélectionné pollen.action.editUser=Editer un utilisateur sélectionné pollen.action.login=M'identifier pollen.action.modify=Modifier @@ -21,6 +29,7 @@ pollen.common.beginChoiceDate=Date de début des choix pollen.common.beginDate=Date de début pollen.common.bugReport=Rapport de bug +pollen.common.csvImport=Import CSV pollen.common.description=Description pollen.common.email=Em@il pollen.common.endChoiceDate=Date de fin des choix @@ -28,8 +37,11 @@ pollen.common.firstName=Prénom pollen.common.functions=Fonctions pollen.common.lastName=Nom +pollen.common.ldapImport=Import LDAP pollen.common.license=Licence pollen.common.login=Identifiant +pollen.common.name=Nom +pollen.common.nbAccounts=Nombre de membres pollen.common.newPassword=Nouveau mot de passe pollen.common.newPassword2=Répétez votre nouveau mot de passe pollen.common.or=ou @@ -52,25 +64,45 @@ pollen.common.voteCountingType=Type de dépouillement pollen.common.x=Dépouillement pollen.error.email.required=Courriel obligatoire +pollen.error.favoriteList.already.used=Nom de liste déjà utilisé +pollen.error.favoriteList.not.found=Liste non trouvée +pollen.error.favoriteList.not.owned.by.user=La liste d'utilisateur ne vous appartient pas +pollen.error.favoriteList.participant.already.found.in.list=Nom déjà utilisé dans la liste +pollen.error.favoriteList.participant.not.found.in.list=Membre non trouvé dans la liste +pollen.error.favoriteListName.required=Nom de liste obligatoire pollen.error.login.required=Login obligatoire pollen.error.password.required=Mot de passe obligatoire pollen.error.password2.required=Mot de passe répété obligatoire pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.pollAccount.email.required=Em@il obliqatoire +pollen.error.pollAccount.not.found=Membre non trouvé +pollen.error.pollAccount.votingId.required=Nom obliqatoire pollen.error.user.bad.login.or.password=Mauvais identifiant ou mot de passe. pollen.error.user.email.already.used=Le courriel saisi est déjà utilisé par un autre utilisateur pollen.error.user.invalid.password=Mot de passe invalide pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur +pollen.error.user.not.found=Utilisateur non trouvé pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Connexion pollen.fieldset.poll.choices=Les choix pollen.fieldset.poll.general=Votre sondage pollen.fieldset.poll.options=Les options pollen.fieldset.poll.you=Vous +pollen.fieldset.pollAccount.toAddToFavoriteList=Ajouter un membre +pollen.fieldset.pollAccount.toDeleteFromFavoriteList=Supprimer un membre +pollen.fieldset.pollAccount.toEditToFavoriteList=Editer le membre +pollen.fieldset.userFavoriteList.toCreate=Créer une nouvelle liste +pollen.fieldset.userFavoriteList.toDelete=List de favoris à supprimer pollen.fieldset.userInformation=Informations de l'utilisateur pollen.fieldset.userInformation.toCreate=Informations de l'utilisateur à créer pollen.fieldset.userInformation.toDelete=Informations de l'utilisateur à supprimer pollen.fieldset.userInformation.toUpdate=Informations de l'utilisateur à mettre à jour +pollen.information.favoriteList.created=La liste %s a été créée. +pollen.information.favoriteList.deleted=La liste %s a été supprimée. pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. +pollen.information.pollAccount.addedTofavoriteList=Le membre %s a été ajoutée à la liste des favoris. +pollen.information.pollAccount.removedFromFavoriteList=Le membre %s a été supprimé de la liste des favoris. +pollen.information.pollAccount.updatedTofavoriteList=Le membre %s a été mise à jour dans la liste des favoris. pollen.information.user.created=L'utilisateur %s a été créé. pollen.information.user.deleted=L'utilisateur %s a été supprimé. pollen.information.user.updated=L'utilisateur %s a été mis à jour. @@ -79,18 +111,20 @@ pollen.legend.login=Login pollen.menu.admin=Administration pollen.menu.createPoll=Créer un sondage -pollen.menu.displayCreatedPolls=Sondages créés -pollen.menu.displayParticipatedPolls=Sondages participés -pollen.menu.displayVotingLists=Listes de votants pollen.menu.home=Accueil pollen.menu.login=Identifiez-vous pollen.menu.logout=Déconnexion pollen.menu.managePolls=Gérer les sondages pollen.menu.manageUsers=Gérer les utilisateurs pollen.menu.polls=Sondages +pollen.menu.pollsCreatedList=Sondages créés +pollen.menu.pollsParticipatedList=Sondages participés pollen.menu.preferences=Mon compte pollen.menu.register=Inscrivez-vous +pollen.menu.userFavoriteLists=Listes de votants pollen.title.createPoll=Nouveau sondage +pollen.title.editFavoriteList=Edition de la liste des favoris +pollen.title.favoriteLists=Vos listes de votants pollen.title.myAccount=Mon compte pollen.title.pollsCreatedList=Sondages créés pollen.title.pollsCreatedList.legend=Liste des sondages que vous avez proposés Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,44 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="login"> - - <field-validator type="requiredstring"> - <message key="pollen.error.login.required"/> - </field-validator> - </field> - - <field name="password"> - - <field-validator type="requiredstring"> - <message key="pollen.error.password.required"/> - </field-validator> - - </field> - -</validators> Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,65 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="user.login"> - - <field-validator type="requiredstring"> - <message key="pollen.error.login.required"/> - </field-validator> - </field> - - <field name="user.password"> - - <field-validator type="requiredstring"> - <message key="pollen.error.password.required"/> - </field-validator> - - </field> - - <field name="password2"> - - <field-validator type="requiredstring" short-circuit="true"> - <message key="pollen.error.password2.required"/> - </field-validator> - - <field-validator type="fieldexpression"> - <param name="expression">password2.equals(user.password)</param> - <message key="pollen.error.passwords.not.equals"/> - </field-validator> - - </field> - - <field name="user.email"> - - <field-validator type="requiredstring"> - <message key="pollen.error.email.required"/> - </field-validator> - - </field> - -</validators> Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,61 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="user.login"> - - <field-validator type="requiredstring"> - <message key="pollen.error.login.required"/> - </field-validator> - </field> - - <field name="user.password"> - - <field-validator type="requiredstring"> - <message key="pollen.error.password.required"/> - </field-validator> - - </field> - - <field name="newPassword2"> - - <field-validator type="fieldexpression"> - <param name="expression">newPassword == null || newPassword == null || newPassword2.equals(newPassword)</param> - <message key="pollen.error.passwords.not.equals"/> - </field-validator> - - </field> - - <field name="user.email"> - - <field-validator type="requiredstring"> - <message key="pollen.error.email.required"/> - </field-validator> - - </field> - -</validators> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,45 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="createUser.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + + </field> + + <field name="createUser.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,45 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="user.login"> - - <field-validator type="requiredstring"> - <message key="pollen.error.login.required"/> - </field-validator> - - </field> - - <field name="user.email"> - - <field-validator type="requiredstring"> - <message key="pollen.error.email.required"/> - </field-validator> - - </field> - -</validators> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,45 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="editUser.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + + </field> + + <field name="editUser.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,45 +0,0 @@ - -<!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> -<validators> - - <field name="user.login"> - - <field-validator type="requiredstring"> - <message key="pollen.error.login.required"/> - </field-validator> - - </field> - - <field name="user.email"> - - <field-validator type="requiredstring"> - <message key="pollen.error.email.required"/> - </field-validator> - - </field> - -</validators> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,61 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="user.password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + + <field name="newPassword2"> + + <field-validator type="fieldexpression"> + <param name="expression">newPassword == null || newPassword == null || newPassword2.equals(newPassword)</param> + <message key="pollen.error.passwords.not.equals"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,44 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + + <field name="createPollAccount.votingId"> + + <field-validator type="requiredstring"> + <message key="pollen.error.pollAccount.votingId.required"/> + </field-validator> + + </field> + + <field name="createPollAccount.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.pollAccount.email.required"/> + </field-validator> + + </field> + +</validators> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + +<validators> + + <field name="editPollAccount.votingId"> + + <field-validator type="requiredstring"> + <message key="pollen.error.pollAccount.votingId.required"/> + </field-validator> + + </field> + + <field name="editPollAccount.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.pollAccount.email.required"/> + </field-validator> + + </field> + +</validators> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,37 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="createFavoriteList.name"> + + <field-validator type="requiredstring"> + <message key="pollen.error.favoriteListName.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,65 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="user.password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + + <field name="password2"> + + <field-validator type="requiredstring" short-circuit="true"> + <message key="pollen.error.password2.required"/> + </field-validator> + + <field-validator type="fieldexpression"> + <param name="expression">password2.equals(user.password)</param> + <message key="pollen.error.passwords.not.equals"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -89,7 +89,7 @@ <div class="top_left${pageLogo}"></div> <ul class="top_middle${pageLogo}"> <li> - <s:a action="showUser" namespace="/user"> + <s:a action="show" namespace="/user"> <s:text name="pollen.menu.preferences"/> </s:a> </li> @@ -103,8 +103,9 @@ </span> </s:if> <s:else> - <span onClick="$('#login_menu').toggle()"><s:text - name="pollen.menu.login"/></span> + <span onClick="$('#login_menu').toggle()"> + <s:text name="pollen.menu.login"/> + </span> <div class="dropdown_menu" id="login_menu" style="display: none;"> <div class="top_right${pageLogo}"></div> @@ -133,7 +134,7 @@ </s:form> </div> <s:text name="pollen.common.or"/> - <s:a action="registerUser" method="input" namespace="/user"> + <s:a action="register" method="input" namespace="/user"> <s:text name="pollen.menu.register"/> </s:a> </s:else> @@ -156,24 +157,24 @@ <div class="top_left${pageLogo}"></div> <ul class="top_middle${pageLogo}"> <li> - <s:a action="createPoll" method="input" namespace="/poll"> + <s:a action="create" method="input" namespace="/poll"> <s:text name="pollen.menu.createPoll"/> </s:a> </li> <s:if test="userExists"> <li> - <s:a action="displayCreatedPolls" method="input" namespace="/poll"> - <s:text name="pollen.menu.displayCreatedPolls"/> + <s:a action="createdList" method="input" namespace="/poll"> + <s:text name="pollen.menu.pollsCreatedList"/> </s:a> </li> <li> - <s:a action="displayParticipatedPolls" method="input" namespace="/poll"> - <s:text name="pollen.menu.displayParticipatedPolls"/> + <s:a action="participatedList" method="input" namespace="/poll"> + <s:text name="pollen.menu.pollsParticipatedList"/> </s:a> </li> <li> - <s:a action="displayVotingLists" method="input" namespace="/user"> - <s:text name="pollen.menu.displayVotingLists"/> + <s:a action="favoriteLists" namespace="/user"> + <s:text name="pollen.menu.userFavoriteLists"/> </s:a> </li> </s:if> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -28,6 +28,7 @@ <pattern>/js/*</pattern> <pattern>/images/*</pattern> <pattern>/config-browser/*</pattern> + <pattern>/json/*</pattern> </excludes> <decorator name="layout-default" page="layout-default.jsp"> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -30,7 +30,7 @@ <h1 class="title${pageLogo}"><s:text name="pollen.title.usersList"/></h1> -<s:url id="loadUSers" action="getUsers" namespace="/json" escapeAmp="false"/> +<s:url id="loadUsers" action="getUsers" namespace="/json" escapeAmp="false"/> <s:url id="loadUser" action="getUser" namespace="/json"/> @@ -39,10 +39,13 @@ <script type="text/javascript"> jQuery(document).ready(function () { + + var action='${action}'; + if ('${action}' == 'create') { $('#createForm').show(); } - if ('${action}' == 'update') { + if ('${action}' == 'edit') { $('#editForm').show(); } if ('${action}' == 'delete') { @@ -53,27 +56,47 @@ $.addRowSelectTopic('users'); $.addClearSelectTopic('users', function(){ + if (action !='') { + // come back from action + action=''; + return; + } $(".userForm").hide(); }); + // to create a new row + $.listenRowTopic('users-addRow', function(event) { + + $('#createForm .errorMessage').hide(); + $('#createForm [name="createUser.login"]').val(""); + $('#createForm [name="createUser.email"]').val(""); + $('#createForm [name="createUser.firstName"]').val(""); + $('#createForm [name="createUser.lastName"]').val(""); + $('#createForm [name="createUser.administrator"]').prop('checked',false); + $('#editForm').hide(); + $('#deleteForm').hide(); + $('#createForm').show(); + }); + // to edit a selected row $.listenRowTopic('users-editRow', function (event) { - if(!jQuery.struts2_jquery['users']) { + var id = $.getSelectedId('users'); + if(!id) { // no user selected return; } - var id = jQuery.struts2_jquery['users']['selectedRow']; + $('#editForm .errorMessage').hide(); jQuery.getJSON("${loadUser}", { "userId":id }, function (result) { var user = result.user; - $('#editForm [name="user.topiaId"]').val(user.id); - $('#editForm [name="user.login"]').val(user.login); - $('#editForm [name="user.email"]').val(user.email); - $('#editForm [name="user.firstName"]').val(user.firstName); - $('#editForm [name="user.lastName"]').val(user.lastName); - $('#editForm [name="user.administrator"]').prop('checked',false); - $('#editForm [name="user.administrator"]').prop('checked',user.administrator); + $('#editForm [name="editUser.topiaId"]').val(user.id); + $('#editForm [name="editUser.login"]').val(user.login); + $('#editForm [name="editUser.email"]').val(user.email); + $('#editForm [name="editUser.firstName"]').val(user.firstName); + $('#editForm [name="editUser.lastName"]').val(user.lastName); + $('#editForm [name="editUser.administrator"]').prop('checked',false); + $('#editForm [name="editUser.administrator"]').prop('checked',user.administrator); $('#editForm').show(); $('#createForm').hide(); $('#deleteForm').hide(); @@ -81,26 +104,15 @@ ); }); - // to create a new row - $.listenRowTopic('users-addRow', function(event) { - $('#createForm [name="user.login"]').val(""); - $('#createForm [name="user.email"]').val(""); - $('#createForm [name="user.firstName"]').val(""); - $('#createForm [name="user.lastName"]').val(""); - $('#createForm [name="user.administrator"]').prop('checked',false); - $('#editForm').hide(); - $('#deleteForm').hide(); - $('#createForm').show(); - }); - // to delete the selected row $.listenRowTopic('users-deleteRow', function(event) { - if(!jQuery.struts2_jquery['users']) { + var id = $.getSelectedId('users'); + if(!id) { // no user selected return; } - var id = jQuery.struts2_jquery['users']['selectedRow']; + var userId = '${user.topiaId}'; if (id == userId) { @@ -108,17 +120,18 @@ // can not delete connected user return; } + $('#deleteForm .errorMessage').hide(); jQuery.getJSON("${loadUser}", { "userId":id }, function (result) { var user = result.user; - $('#deleteForm [name="user.topiaId"]').val(user.id); - $('#deleteForm [name="user.login"]').val(user.login); - $('#deleteForm [name="user.email"]').val(user.email); - $('#deleteForm [name="user.firstName"]').val(user.firstName); - $('#deleteForm [name="user.lastName"]').val(user.lastName); - $('#deleteForm [name="user.administrator"]').prop('checked',false); - $('#deleteForm [name="user.administrator"]').prop('checked',user.administrator); + $('#deleteForm [name="deleteUser.topiaId"]').val(user.id); + $('#deleteForm [name="deleteUser.login"]').val(user.login); + $('#deleteForm [name="deleteUser.email"]').val(user.email); + $('#deleteForm [name="deleteUser.firstName"]').val(user.firstName); + $('#deleteForm [name="deleteUser.lastName"]').val(user.lastName); + $('#deleteForm [name="deleteUser.administrator"]').prop('checked',false); + $('#deleteForm [name="deleteUser.administrator"]').prop('checked',user.administrator); $('#editForm').hide(); $('#createForm').hide(); $('#deleteForm').show(); @@ -128,7 +141,7 @@ }); </script> -<sjg:grid id="users" dataType="json" href="%{loadUSers}" gridModel="users" +<sjg:grid id="users" dataType="json" href="%{loadUsers}" gridModel="users" sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editinline="false" @@ -139,7 +152,7 @@ rowList="10,15,20,50,100" rowNum="10" navigatorExtraButtons="{ add: { title: '%{getText(\"pollen.action.createUser\")}', icon: 'ui-icon-plus', topic: 'users-addRow' }, - edit: { title: '%{getText(\"pollen.action.editUser\")}', icon: 'ui-icon-pencil', topic: 'users-editRow' }, + edit: { title: '%{getText(\"pollen.action.editUser\")}', icon: 'ui-icon-pencil', topic: 'users-editRow' }, delete:{ title: '%{getText(\"pollen.action.deleteUser\")}', icon: 'ui-icon-trash', topic: 'users-deleteRow' }}"> <sjg:gridColumn name="id" title="id" hidden="true"/> @@ -147,60 +160,60 @@ <sjg:gridColumn name="firstName" title='%{getText("pollen.common.firstName")}'/> <sjg:gridColumn name="lastName" title='%{getText("pollen.common.lastName")}'/> <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}'/> - <sjg:gridColumn name="administrator" title='%{getText("pollen.common.administrator")}'width="100" formatter="checkbox" /> + <sjg:gridColumn name="administrator" width="100" formatter="checkbox" + title='%{getText("pollen.common.administrator")}' /> </sjg:grid> <br/> -<s:form id='editForm' method="POST" namespace="/admin" cssClass="hidden userForm"> +<s:form id='createForm' method="POST" namespace="/admin" cssClass="hidden userForm"> - <s:hidden name="action" value="update"/> - <s:hidden key="user.topiaId" label=""/> - <%--<s:hidden key="user.login" label=""/>--%> - + <s:hidden name="action" value="create"/> <fieldset> - <legend><s:text name="pollen.fieldset.userInformation.toUpdate"/></legend> - <s:textfield key="user.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> - <s:textfield key="user.email" label="%{getText('pollen.common.email')}" required="true" size="40"/> - <s:textfield key="user.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> - <s:textfield key="user.lastName" label="%{getText('pollen.common.lastName')}" size="40"/> - <s:checkbox key="user.administrator" label="%{getText('pollen.common.administrator')}"/> + <legend><s:text name="pollen.fieldset.userInformation.toCreate"/></legend> + <s:textfield key="createUser.login" label="%{getText('pollen.common.login')}" required="true" size="40"/> + <s:textfield key="createUser.email" label="%{getText('pollen.common.email')}" required="true" size="40"/> + <s:textfield key="createUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> + <s:textfield key="createUser.lastName" label="%{getText('pollen.common.lastName')}" size="40"/> + <s:checkbox key="createUser.administrator" label="%{getText('pollen.common.administrator')}"/> </fieldset> <br/> - <s:submit action="updateUser" key="pollen.action.validate" align="center"/> - + <s:submit action="create" key="pollen.action.create" align="center"/> </s:form> -<s:form id='createForm' method="POST" namespace="/admin" cssClass="hidden userForm"> +<s:form id='editForm' method="POST" namespace="/admin" cssClass="hidden userForm"> - <s:hidden name="action" value="create"/> + <s:hidden name="action" value="edit"/> + <s:hidden key="editUser.topiaId" label=""/> + <fieldset> - <legend><s:text name="pollen.fieldset.userInformation.toCreate"/></legend> - <s:textfield key="user.login" label="%{getText('pollen.common.login')}" required="true" size="40"/> - <s:textfield key="user.email" label="%{getText('pollen.common.email')}" required="true" size="40"/> - <s:textfield key="user.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> - <s:textfield key="user.lastName" label="%{getText('pollen.common.lastName')}" size="40"/> - <s:checkbox key="user.administrator" label="%{getText('pollen.common.administrator')}"/> + <legend><s:text name="pollen.fieldset.userInformation.toUpdate"/></legend> + <s:textfield key="editUser.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> + <s:textfield key="editUser.email" label="%{getText('pollen.common.email')}" required="true" size="40"/> + <s:textfield key="editUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> + <s:textfield key="editUser.lastName" label="%{getText('pollen.common.lastName')}" size="40"/> + <s:checkbox key="editUser.administrator" label="%{getText('pollen.common.administrator')}"/> </fieldset> <br/> - <s:submit action="createUser" key="pollen.action.create" align="center"/> + <s:submit action="edit" key="pollen.action.validate" align="center"/> + </s:form> <s:form id='deleteForm' method="POST" namespace="/admin" cssClass="hidden userForm"> <s:hidden name="action" value="delete"/> - <s:hidden key="user.topiaId" label=""/> + <s:hidden key="deleteUser.topiaId" label=""/> <fieldset> <legend><s:text name="pollen.fieldset.userInformation.toDelete"/></legend> - <s:textfield key="user.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> - <s:textfield key="user.email" label="%{getText('pollen.common.email')}" required="true" readonly="true" size="40"/> - <s:textfield key="user.firstName" label="%{getText('pollen.common.firstName')}" readonly="true" size="40"/> - <s:textfield key="user.lastName" label="%{getText('pollen.common.lastName')}" readonly="true" size="40"/> - <s:checkbox key="user.administrator" label="%{getText('pollen.common.administrator')}" disabled="true"/> + <s:textfield key="deleteUser.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> + <s:textfield key="deleteUser.email" label="%{getText('pollen.common.email')}" required="true" readonly="true" size="40"/> + <s:textfield key="deleteUser.firstName" label="%{getText('pollen.common.firstName')}" readonly="true" size="40"/> + <s:textfield key="deleteUser.lastName" label="%{getText('pollen.common.lastName')}" readonly="true" size="40"/> + <s:checkbox key="deleteUser.administrator" label="%{getText('pollen.common.administrator')}" disabled="true"/> </fieldset> <br/> - <s:submit action="deleteUser" key="pollen.action.delete" align="center"/> + <s:submit action="delete" key="pollen.action.delete" align="center"/> </s:form> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>clone poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>close poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,137 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<script type="text/javascript"> + + jQuery(document).ready(function () { + $('[name="poll.choiceAddAllowed"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#addChoiceAddAllowedPanel').show(); + } else { + $('#addChoiceAddAllowedPanel').hide(); + } + }); + + $('[name="limitChoice"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#maxChoiceNbPanel').show(); + } else { + $('#maxChoiceNbPanel').hide(); + } + }); + + $('[name="reminder"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#reminderPanel').show(); + } else { + $('#reminderPanel').hide(); + } + }); + + $('[name="notification"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#notificationPanel').show(); + } else { + $('#notificationPanel').hide(); + } + }); + + $('[name="poll.anonymous"]').change(function(event) { + var val = $(this).prop('checked'); + $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); + }); + $('[name="poll.continuousResults"]').change(function(event) { + var val = $(this).prop('checked'); + $('[name="poll.publicResults"]').prop('checked', val); + }); + }); +</script> +<title><s:text name="pollen.title.createPoll"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.createPoll"/></h1> + +<s:form method="POST" key="registerForm" namespace="/poll"> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.you"/></legend> + <s:textfield key="poll.creator.name" label="%{getText('pollen.common.login')}" required="true"/> + <s:textfield key="poll.creator.email" label="%{getText('pollen.common.email')}"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.general"/></legend> + + <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true"/> + <s:textfield key="poll.description" label="%{getText('pollen.common.description')}"/> + <sj:datepicker key="poll.beginDate" label="%{getText('pollen.common.beginDate')}" displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endDate" label="%{getText('pollen.common.endDate')}" displayFormat="dd/mm/yy"/> + <s:radio key='poll.pollType' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> + <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.options"/></legend> + + <s:checkbox key="poll.anonymous" label="%{getText('pollen.common.pollOption.anonymous')}" /> + <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" /> + <s:checkbox key="poll.continuousResults" label="%{getText('pollen.common.pollOption.continuousResults')}" /> + <s:checkbox key="poll.publicResults" label="%{getText('pollen.common.pollOption.publicResults')}" /> + <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" /> + <div id='addChoiceAddAllowedPanel' class="hidden"> + <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endChoiceDate" label="%{getText('pollen.common.endChoiceDate')}" displayFormat="dd/mm/yy"/> + </div> + <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" /> + <div id='maxChoiceNbPanel' class="hidden"> + <s:textfield key="poll.maxChoiceNb" label="%{getText('pollen.common.pollOption.maxChoiceNb')}"/> + </div> + <s:checkbox key="notification" label="%{getText('pollen.common.pollOption.notification')}" /> + <div id='notificationPanel' class="hidden"> + <s:textfield key="notificationNumber" + label="%{getText('pollen.common.pollOption.notificationNumber')}" /> + </div> + <s:checkbox key="reminder" label="%{getText('pollen.common.pollOption.reminder')}" /> + <div id='reminderPanel' class="hidden"> + <s:textfield key="reminderHourCountdown" + label="%{getText('pollen.common.pollOption.reminderHourCountdown')}" /> + </div> + + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.choices"/></legend> + <s:select key="poll.choiceType" label='%{getText("poll.common.select.choiceType")}' + list="choiceTypes" headerKey="" headerValue=""/> + + </fieldset> + + <br/> + <s:submit action="create" key="pollen.action.createPoll" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,137 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> -<script type="text/javascript"> - - jQuery(document).ready(function () { - $('[name="poll.choiceAddAllowed"]').change(function(event) { - var val = $(this).prop('checked'); - if (val) { - $('#addChoiceAddAllowedPanel').show(); - } else { - $('#addChoiceAddAllowedPanel').hide(); - } - }); - - $('[name="limitChoice"]').change(function(event) { - var val = $(this).prop('checked'); - if (val) { - $('#maxChoiceNbPanel').show(); - } else { - $('#maxChoiceNbPanel').hide(); - } - }); - - $('[name="reminder"]').change(function(event) { - var val = $(this).prop('checked'); - if (val) { - $('#reminderPanel').show(); - } else { - $('#reminderPanel').hide(); - } - }); - - $('[name="notification"]').change(function(event) { - var val = $(this).prop('checked'); - if (val) { - $('#notificationPanel').show(); - } else { - $('#notificationPanel').hide(); - } - }); - - $('[name="poll.anonymous"]').change(function(event) { - var val = $(this).prop('checked'); - $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); - }); - $('[name="poll.continuousResults"]').change(function(event) { - var val = $(this).prop('checked'); - $('[name="poll.publicResults"]').prop('checked', val); - }); - }); -</script> -<title><s:text name="pollen.title.createPoll"/></title> - -<h1 class="title${pageLogo}"><s:text name="pollen.title.createPoll"/></h1> - -<s:form method="POST" key="registerForm" namespace="/poll"> - - <fieldset> - <legend><s:text name="pollen.fieldset.poll.you"/></legend> - <s:textfield key="poll.creator.name" label="%{getText('pollen.common.login')}" required="true"/> - <s:textfield key="poll.creator.email" label="%{getText('pollen.common.email')}"/> - </fieldset> - - <fieldset> - <legend><s:text name="pollen.fieldset.poll.general"/></legend> - - <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true"/> - <s:textfield key="poll.description" label="%{getText('pollen.common.description')}"/> - <sj:datepicker key="poll.beginDate" label="%{getText('pollen.common.beginDate')}" displayFormat="dd/mm/yy"/> - <sj:datepicker key="poll.endDate" label="%{getText('pollen.common.endDate')}" displayFormat="dd/mm/yy"/> - <s:radio key='poll.pollType' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> - <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> - </fieldset> - - <fieldset> - <legend><s:text name="pollen.fieldset.poll.options"/></legend> - - <s:checkbox key="poll.anonymous" label="%{getText('pollen.common.pollOption.anonymous')}" /> - <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" /> - <s:checkbox key="poll.continuousResults" label="%{getText('pollen.common.pollOption.continuousResults')}" /> - <s:checkbox key="poll.publicResults" label="%{getText('pollen.common.pollOption.publicResults')}" /> - <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" /> - <div id='addChoiceAddAllowedPanel' class="hidden"> - <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" displayFormat="dd/mm/yy"/> - <sj:datepicker key="poll.endChoiceDate" label="%{getText('pollen.common.endChoiceDate')}" displayFormat="dd/mm/yy"/> - </div> - <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" /> - <div id='maxChoiceNbPanel' class="hidden"> - <s:textfield key="poll.maxChoiceNb" label="%{getText('pollen.common.pollOption.maxChoiceNb')}"/> - </div> - <s:checkbox key="notification" label="%{getText('pollen.common.pollOption.notification')}" /> - <div id='notificationPanel' class="hidden"> - <s:textfield key="notificationNumber" - label="%{getText('pollen.common.pollOption.notificationNumber')}" /> - </div> - <s:checkbox key="reminder" label="%{getText('pollen.common.pollOption.reminder')}" /> - <div id='reminderPanel' class="hidden"> - <s:textfield key="reminderHourCountdown" - label="%{getText('pollen.common.pollOption.reminderHourCountdown')}" /> - </div> - - </fieldset> - - <fieldset> - <legend><s:text name="pollen.fieldset.poll.choices"/></legend> - <s:select key="poll.choiceType" label='%{getText("poll.common.select.choiceType")}' - list="choiceTypes" headerKey="" headerValue=""/> - - </fieldset> - - <br/> - <s:submit action="createPoll" key="pollen.action.createPoll" align="center"/> -</s:form> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>delete poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>edit poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>export poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>result poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<h2>vote poll TODO</h2> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -26,33 +26,33 @@ <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> -<s:url id="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> +<s:url id="loadUrl" action="getPolls" namespace="/json" method="input"/> -<s:url id="voteUrl" action="vote" namespace="/poll" escapeAmp="false"/> +<s:url id="voteUrl" action="vote" namespace="/poll" method="input"/> <s:url id='voteImg' value='/img/vote.png'/> <s:set id='voteTitle'><s:text name="pollen.action.pollVote"/></s:set> -<s:url id="resultUrl" action="result" namespace="/poll" escapeAmp="false"/> +<s:url id="resultUrl" action="result" namespace="/poll" method="input"/> <s:url id='resultImg' value='/img/count.png'/> <s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> -<s:url id="editUrl" action="edit" namespace="/poll" escapeAmp="false"/> +<s:url id="editUrl" action="edit" namespace="/poll" method="input"/> <s:url id='editImg' value='/img/edit.png'/> <s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set> -<s:url id="closeUrl" action="close" namespace="/poll" escapeAmp="false"/> +<s:url id="closeUrl" action="close" namespace="/poll" method="input"/> <s:url id='closeImg' value='/img/close.png'/> <s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set> -<s:url id="exportUrl" action="export" namespace="/poll" escapeAmp="false"/> +<s:url id="exportUrl" action="export" namespace="/poll" method="input"/> <s:url id='exportImg' value='/img/export.png'/> <s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set> -<s:url id="cloneUrl" action="clone" namespace="/poll" escapeAmp="false"/> +<s:url id="cloneUrl" action="clone" namespace="/poll" method="input"/> <s:url id='cloneImg' value='/img/copy.png'/> <s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set> -<s:url id="deleteUrl" action="delete" namespace="/poll" escapeAmp="false"/> +<s:url id="deleteUrl" action="delete" namespace="/poll" method="input"/> <s:url id='deleteImg' value='/img/delete.png'/> <s:set id='deleteTitle'><s:text name="pollen.action.pollDelete"/></s:set> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,53 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="pollen.title.myAccount"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> + +<s:form method="POST" namespace="/user"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:hidden key="user.topiaId" label=""/> + <s:textfield name="user.login" key="pollen.common.login" required="true"/> + <s:password name="user.password" key="pollen.common.password" + required="true"/> + <s:password name="newPassword" key="pollen.common.newPassword"/> + <s:password name="newPassword2" key="pollen.common.newPassword2"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:textfield name="user.email" key="pollen.common.email" required="true"/> + <s:textfield name="user.firstName" key="pollen.common.firstName"/> + <s:textfield name="user.lastName" key="pollen.common.lastName"/> + </fieldset> + <br/> + <s:submit action="edit" key="pollen.action.validate" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,217 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + +<s:url id="loadPollAccounts" action="getFavoriteListPollAccounts" + namespace="/json" escapeAmp="false"> + <s:param name="favoriteListId" value="%{favoriteListId}"/> +</s:url> + +<s:url id="loadPollAccount" action="getFavoriteListPollAccount" + namespace="/json"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + var action = '${action}'; + + if ('${action}' == 'create') { + $('#createForm').show(); + } else if ('${action}' == 'edit') { + $('#editForm').show(); + } else if ('${action}' == 'delete') { + $('#deleteForm').show(); + } + + // listen row selection + $.addRowSelectTopic('pollAccounts'); + + $.addClearSelectTopic('pollAccounts', function () { + if (action != '') { + // come back from action + action = ''; + return; + } + $(".pollAccountForm").hide(); + }); + + // to create a new row + $.listenRowTopic('pollAccounts-addRow', function (event) { + $('#createForm [name="createPollAccount.votingId"]').val(""); + $('#createForm [name="createPollAccount.email"]').val(""); + $('#deleteForm').hide(); + $('#editForm').hide(); + $('#createForm').show(); + }); + + // to edit the selected row + $.listenRowTopic('pollAccounts-editRow', function (event) { + var id = $.getSelectedId('pollAccounts'); + if (!id) { + + // no row selected + return; + } + + jQuery.getJSON("${loadPollAccount}", { "pollAccountId":id }, + function (result) { + + var pollAccount = result.pollAccount; + $('#editForm [name="editPollAccount.topiaId"]').val(pollAccount.id); + $('#editForm [name="editPollAccount.votingId"]').val(pollAccount.votingId); + $('#editForm [name="editPollAccount.email"]').val(pollAccount.email); + $('#deleteForm').hide(); + $('#createForm').hide(); + $('#editForm').show(); + } + ); + }); + + // to delete the selected row + $.listenRowTopic('pollAccounts-deleteRow', function (event) { + var id = $.getSelectedId('pollAccounts'); + if (!id) { + + // no row selected + return; + } + + jQuery.getJSON("${loadPollAccount}", { "pollAccountId":id }, + function (result) { + + var pollAccount = result.pollAccount; + $('#deleteForm [name="deletePollAccount.topiaId"]').val(pollAccount.id); + $('#deleteForm [name="deletePollAccount.votingId"]').val(pollAccount.votingId); + $('#deleteForm [name="deletePollAccount.email"]').val(pollAccount.email); + $('#editForm').hide(); + $('#createForm').hide(); + $('#deleteForm').show(); + } + ); + }); + }); +</script> + +<title> + <s:text name="pollen.title.editFavoriteList"/> ${favoriteList.name} +</title> + +<h1 class="title${pageLogo}"> + <s:text name="pollen.title.editFavoriteList"/> ${favoriteList.name} +</h1> + +<sjg:grid id="pollAccounts" dataType="json" href="%{loadPollAccounts}" + gridModel="pollAccounts" sortable="true" pager="true" + pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='pollAccounts-rowSelect' editinline="false" + onCompleteTopics='pollAccounts-clearSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10" + navigatorExtraButtons="{ + add: { title: '%{getText(\"pollen.action.createPollAccount\")}', icon: 'ui-icon-plus', topic: 'pollAccounts-addRow' }, + edit: { title: '%{getText(\"pollen.action.editPollAccount\")}', icon: 'ui-icon-pencil', topic: 'pollAccounts-editRow' }, + delete:{ title: '%{getText(\"pollen.action.deletePollAccount\")}', icon: 'ui-icon-trash', topic: 'pollAccounts-deleteRow'}}"> + + <sjg:gridColumn name="id" title="id" hidden="true"/> + <sjg:gridColumn name="votingId" title='%{getText("pollen.common.name")}'/> + <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}'/> +</sjg:grid> + +<br/> + +<s:form id='createForm' method="POST" namespace="/user" + cssClass="hidden pollAccountForm"> + + <s:hidden name="action" value="create"/> + <s:hidden key="favoriteListId" label=""/> + <fieldset> + <legend> + <s:text name="pollen.fieldset.pollAccount.toAddToFavoriteList"/> + </legend> + <s:textfield key="createPollAccount.votingId" required="true" + label="%{getText('pollen.common.name')}" size="40"/> + <s:textfield key="createPollAccount.email" required="true" + label="%{getText('pollen.common.email')}" size="40"/> + + </fieldset> + <br/> + <s:submit action="addPollAccount" + key="pollen.action.create" align="center"/> +</s:form> + +<s:form id='editForm' method="POST" namespace="/user" + cssClass="hidden pollAccountForm"> + + <s:hidden name="action" value="edit"/> + <s:hidden key="editPollAccount.topiaId" label=""/> + <s:hidden key="favoriteListId" label=""/> + + <fieldset> + <legend> + <s:text name="pollen.fieldset.pollAccount.toEditToFavoriteList"/> + </legend> + <s:textfield key="editPollAccount.votingId" required="true" + label="%{getText('pollen.common.name')}" size="40"/> + <s:textfield key="editPollAccount.email" required="true" + label="%{getText('pollen.common.email')}" size="40"/> + </fieldset> + <br/> + <s:submit action="editPollAccount" key="pollen.action.validate" + align="center"/> +</s:form> + +<s:form id='deleteForm' method="POST" namespace="/user" + cssClass="hidden pollAccountForm"> + + <s:hidden name="action" value="delete"/> + <s:hidden key="deletePollAccount.topiaId" label=""/> + <s:hidden key="favoriteListId" label=""/> + + <fieldset> + <legend> + <s:text name="pollen.fieldset.pollAccount.toDeleteFromFavoriteList"/> + </legend> + <s:textfield key="deletePollAccount.votingId" required="true" size="40" + label="%{getText('pollen.common.name')}" readonly="true"/> + <s:textfield key="deletePollAccount.email" required="true" readonly="true" + label="%{getText('pollen.common.email')}" size="40"/> + </fieldset> + <br/> + + <s:submit action="removePollAccount" key="pollen.action.delete" align="center"/> +</s:form> + +<br/> +<s:form method="POST" namespace="/user"> + + <s:submit action="favoriteLists" + key="pollen.action.backToFavoriteLists" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,172 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + +<title><s:text name="pollen.title.favoriteLists"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.favoriteLists"/></h1> + +<s:url id="loadFavoriteLists" action="getFavoriteLists" namespace="/json"/> +<s:url id="loadFavoriteList" action="getFavoriteList" namespace="/json"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + + var action = '${action}'; + + if ('${action}' == 'create') { + $('#createForm').show(); + } else if ('${action}' == 'delete') { + $('#deleteForm').show(); + } + + // listen row selection + $.addRowSelectTopic('favoriteLists'); + + $.addClearSelectTopic('favoriteLists', function () { + if (action != '') { + // come back from action + action = ''; + return; + } + $(".userForm").hide(); + }); + + // to create a new row + $.listenRowTopic('favoriteLists-addRow', function (event) { + + $('#createForm .errorMessage').hide(); + $('#createForm [name="favoriteList.name"]').val(""); + $('#createForm [name="csvImport"]').val(""); + $('#createForm [name="ldapImport"]').val(""); + $('#deleteForm').hide(); + $('#createForm').show(); + }); + + // to edit a selected row + $.listenRowTopic('favoriteLists-editRow', function (event) { + var id = $.getSelectedId('favoriteLists'); + if (!id) { + // no row selected + return; + } + + $('#editForm [name="favoriteListId"]').val(id); + $('#editForm').submit(); + }); + + // to delete the selected row + $.listenRowTopic('favoriteLists-deleteRow', function (event) { + var id = $.getSelectedId('favoriteLists'); + if (!id) { + // no row selected + return; + } + jQuery.getJSON("${loadFavoriteList}", { favoriteListId:id }, + function (result) { + var user = result.favoriteList; + $('#deleteForm [name="deleteFavoriteList.topiaId"]').val(user.id); + $('#deleteForm [name="deleteFavoriteList.name"]').val(user.name); + $('#createForm').hide(); + $('#deleteForm').show(); + } + ); + }); + }); +</script> + +<sjg:grid id="favoriteLists" dataType="json" href="%{loadFavoriteLists}" + gridModel="favoriteLists" sortable="true" pager="true" + pagerButtons="true" pagerInput="true" navigator="true" + rownumbers="false" autowidth="true" viewrecords="true" + onSelectRowTopics='favoriteLists-rowSelect' + onCompleteTopics='favoriteLists-clearSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" rowList="10,15,20,50,100" rowNum="10" + navigatorExtraButtons="{ + add: { title: '%{getText(\"pollen.action.createFavoriteList\")}', icon: 'ui-icon-plus', topic: 'favoriteLists-addRow' }, + edit: { title: '%{getText(\"pollen.action.editFavoriteList\")}', icon: 'ui-icon-pencil', topic: 'favoriteLists-editRow' }, + delete:{ title: '%{getText(\"pollen.action.deleteFavoriteList\")}', icon: 'ui-icon-trash', topic: 'favoriteLists-deleteRow'}}"> + + <sjg:gridColumn name="id" title="id" hidden="true"/> + <sjg:gridColumn name="name" title='%{getText("pollen.common.name")}'/> + <sjg:gridColumn name="nbAccounts" + title='%{getText("pollen.common.nbAccounts")}'/> +</sjg:grid> + +<br/> +<s:form id='createForm' method="POST" namespace="/user" + cssClass="hidden favoriteForm"> + + <s:hidden name="action" value="create"/> + <fieldset> + <legend> + <s:text name="pollen.fieldset.userFavoriteList.toCreate"/> + </legend> + <s:textfield key="createFavoriteList.name" required="true" size="40" + label="%{getText('pollen.common.name')}"/> + <s:file key="csvImport" label="%{getText('pollen.common.csvImport')}"/> + <s:textfield key="ldapImport" label="%{getText('pollen.common.ldapImport')}" + size="40"/> + </fieldset> + <br/> + <s:submit action="createFavoriteList" key="pollen.action.create" + align="center"/> +</s:form> + +<s:form id='deleteForm' method="POST" namespace="/user" + cssClass="hidden favoriteForm"> + + <s:hidden name="action" value="delete"/> + <s:hidden key="deleteFavoriteList.topiaId" label=""/> + + <fieldset> + <legend> + <s:text name="pollen.fieldset.userFavoriteList.toDelete"/> + </legend> + <s:textfield key="deleteFavoriteList.name" required="true" readonly="true" + size="40" label="%{getText('pollen.common.name')}"/> + + </fieldset> + <br/> + <s:submit action="deleteFavoriteList" key="pollen.action.delete" + align="center"/> +</s:form> + +<s:form id='editForm' method="POST" namespace="/user" + action="editFavoriteList" theme="simple" + cssClass="hidden"> + + <s:hidden key="favoriteListId" label=""/> + <s:submit action="editFavoriteList"/> + +</s:form> + + + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,50 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="pollen.title.register"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.register"/></h1> + +<s:form method="POST" key="registerForm"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:textfield name="user.login" key="pollen.common.login" required="true"/> + <s:password name="user.password" key="pollen.common.password" required="true"/> + <s:password name="password2" key="pollen.common.password2" required="true"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:textfield name="user.email" key="pollen.common.email" required="true"/> + <s:textfield name="user.firstName" key="pollen.common.firstName"/> + <s:textfield name="user.lastName" key="pollen.common.lastName"/> + </fieldset> + <br/> + <s:submit action="register" key="pollen.action.register" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,50 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="pollen.title.register"/></title> - -<h1 class="title${pageLogo}"><s:text name="pollen.title.register"/></h1> - -<s:form method="POST" key="registerForm"> - - <fieldset> - <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> - - <s:textfield name="user.login" key="pollen.common.login" required="true"/> - <s:password name="user.password" key="pollen.common.password" required="true"/> - <s:password name="password2" key="pollen.common.password2" required="true"/> - </fieldset> - - <fieldset> - <legend><s:text name="pollen.fieldset.userInformation"/></legend> - - <s:textfield name="user.email" key="pollen.common.email" required="true"/> - <s:textfield name="user.firstName" key="pollen.common.firstName"/> - <s:textfield name="user.lastName" key="pollen.common.lastName"/> - </fieldset> - <br/> - <s:submit action="registerUser" key="pollen.action.register" align="center"/> -</s:form> Copied: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp (from rev 3124, branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp) =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -0,0 +1,50 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="pollen.title.myAccount"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> + +<s:form method="POST" namespace="/user"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:hidden key="user.topiaId" label="" /> + <s:label name="user.login" key="pollen.common.login"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:label name="user.email" key="pollen.common.email" /> + <s:label name="user.firstName" key="pollen.common.firstName" /> + <s:label name="user.lastName" key="pollen.common.lastName" /> + </fieldset> + <br/> + <s:submit action="edit" method="input" + key="pollen.action.modify" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,50 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="pollen.title.myAccount"/></title> - -<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> - -<s:form method="POST"> - - <fieldset> - <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> - - <s:hidden key="user.topiaId" label="" /> - <s:label name="user.login" key="pollen.common.login"/> - </fieldset> - - <fieldset> - <legend><s:text name="pollen.fieldset.userInformation"/></legend> - - <s:label name="user.email" key="pollen.common.email" /> - <s:label name="user.firstName" key="pollen.common.firstName" /> - <s:label name="user.lastName" key="pollen.common.lastName" /> - </fieldset> - <br/> - <s:submit action="updateUser" method="input" - key="pollen.action.modify" align="center"/> -</s:form> Deleted: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp 2012-01-31 21:01:08 UTC (rev 3125) @@ -1,53 +0,0 @@ -<%-- - #%L - Pollen :: UI (strust2) - - $Id$ - $HeadURL$ - %% - Copyright (C) 2009 - 2012 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> - -<title><s:text name="pollen.title.myAccount"/></title> - -<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> - -<s:form method="POST"> - - <fieldset> - <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> - - <s:hidden key="user.topiaId" label=""/> - <s:textfield name="user.login" key="pollen.common.login" required="true"/> - <s:password name="user.password" key="pollen.common.password" - required="true"/> - <s:password name="newPassword" key="pollen.common.newPassword"/> - <s:password name="newPassword2" key="pollen.common.newPassword2"/> - </fieldset> - - <fieldset> - <legend><s:text name="pollen.fieldset.userInformation"/></legend> - - <s:textfield name="user.email" key="pollen.common.email" required="true"/> - <s:textfield name="user.firstName" key="pollen.common.firstName"/> - <s:textfield name="user.lastName" key="pollen.common.lastName"/> - </fieldset> - <br/> - <s:submit action="updateUser" key="pollen.action.validate" align="center"/> -</s:form> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-31 21:01:08 UTC (rev 3125) @@ -27,7 +27,7 @@ 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>EchoBase</display-name> + <display-name>Pollen</display-name> <filter> <filter-name>topiaTransaction</filter-name> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-30 23:53:24 UTC (rev 3124) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-31 21:01:08 UTC (rev 3125) @@ -81,6 +81,13 @@ } }, {id:gridId, callback:callback}); }, + getSelectedId: function(gridId) { + var result = $.struts2_jquery[gridId] + if(result) { + result = result['selectedRow']; + } + return result; + }, // addAddRowTopic:function (gridId, url) { // $.subscribe(gridId + '-rowAdd', function (event) { @@ -191,6 +198,9 @@ addMultiRowTopic:function (gridId, action, target, checkboxName, calbback) { return $(document).addMultiRowTopic(gridId, action, target, checkboxName, calbback); }, + getSelectedId: function(gridId) { + return $(document).getSelectedId(gridId); + }, serializeCheckboxs:function (id, params, newId) { return $(document).serializeCheckboxs(id, params, newId); },

1 0

r3124 - in branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/json java/org/chorem/pollen/ui/actions/poll resources resources/config resources/i18n webapp/WEB-INF/decorators webapp/WEB-INF/jsp webapp/WEB-INF/jsp/admin webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 30 Jan '12

30 Jan '12

Author: tchemit Date: 2012-01-31 00:53:24 +0100 (Tue, 31 Jan 2012) New Revision: 3124 Url: http://chorem.org/repositories/revision/pollen/3124 Log: - add poll admin lists - add user poll lists (services are not ok) - fix home page language Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -97,8 +97,8 @@ return result; } - protected Boolean isSortAscendant() { - Boolean result = null; + protected boolean isSortAscendant() { + boolean result = false; if (useSort()) { result = "asc".equals(sord); } Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -0,0 +1,123 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import com.google.common.collect.Sets; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.services.impl.PollService; +import org.nuiton.util.beans.Binder; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Obtain created polls to put in grid for the connected user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetCreatedPolls extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] polls; + + public Map<String, Object>[] getPolls() { + return polls; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + PollService pollService = newService(PollService.class); + + boolean ascendantOrder = isSortAscendant(); + String sortColumn = getSortColumn(); + + List<Poll> pollList = pollService.getCreatedPolls(pager, + sortColumn, + ascendantOrder, + getPollenSession().getUserAccount()); + + polls = new Map[pollList.size()]; + Binder<Poll, Poll> binder = + PollenBinderHelper.getSimpleTopiaBinder(Poll.class); + int index = 0; + for (Poll poll : pollList) { + + Map<String, Object> map = binder.obtainProperties( + poll, + Poll.PROPERTY_TITLE, + Poll.PROPERTY_POLL_ID, + Poll.PROPERTY_DESCRIPTION, + Poll.PROPERTY_BEGIN_DATE, + Poll.PROPERTY_END_DATE + ); + map.put("id", poll.getTopiaId()); + Set<String> functions = getPollFunctions(poll); + map.put("functions", functions); + polls[index++] = map; + } + return SUCCESS; + } + + protected Set<String> getPollFunctions(Poll poll) { + Set<String> result = Sets.newHashSet(); + result.add("vote"); + result.add("result"); + Boolean closed = poll.getClosed(); + if (closed == null || !closed) { + + // poll is not closed + result.add("edit"); + result.add("close"); + } + result.add("export"); + result.add("clone"); + result.add("delete"); + return result; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -0,0 +1,133 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import com.google.common.collect.Sets; +import org.chorem.pollen.business.persistence.PersonToList; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.VotingList; +import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.services.impl.PollService; +import org.nuiton.util.beans.Binder; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Obtain invited polls to put in grid for the connected user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetInvitedPolls extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] polls; + + public Map<String, Object>[] getPolls() { + return polls; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + PollService pollService = newService(PollService.class); + + boolean ascendantOrder = isSortAscendant(); + String sortColumn = getSortColumn(); + + List<Poll> pollList = pollService.getInvitedPolls(pager, + sortColumn, + ascendantOrder, + getPollenSession().getUserAccount()); + + polls = new Map[pollList.size()]; + Binder<Poll, Poll> binder = + PollenBinderHelper.getSimpleTopiaBinder(Poll.class); + int index = 0; + for (Poll poll : pollList) { + + Map<String, Object> map = binder.obtainProperties( + poll, + Poll.PROPERTY_TITLE, + Poll.PROPERTY_POLL_ID, + Poll.PROPERTY_DESCRIPTION, + Poll.PROPERTY_BEGIN_DATE, + Poll.PROPERTY_END_DATE + ); + String userEmail = getPollenSession().getUserAccount().getEmail(); + map.put("voteId", getVoteId(poll, userEmail)); + map.put("id", poll.getTopiaId()); + Set<String> functions = getPollFunctions(poll); + map.put("functions", functions); + polls[index++] = map; + } + return SUCCESS; + } + + protected Set<String> getPollFunctions(Poll poll) { + Set<String> result = Sets.newHashSet(); + result.add("vote"); + result.add("result"); + return result; + } + + protected String getVoteId(Poll poll, String userEmail) { + String result = poll.getPollId(); + for (VotingList list : poll.getVotingList()) { + for (PersonToList account : list.getPollAccountPersonToList()) { + PollAccount pollAccount = account.getPollAccount(); + if (userEmail.equals(pollAccount.getEmail())) { + result += ":" + pollAccount.getAccountId(); + break; + } + } + } + + return result; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -0,0 +1,113 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import com.google.common.collect.Sets; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.services.impl.PollService; +import org.nuiton.util.beans.Binder; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Obtain participated polls to put in grid for the connected user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class GetParticipatedPolls extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] polls; + + public Map<String, Object>[] getPolls() { + return polls; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + PollService pollService = newService(PollService.class); + + boolean ascendantOrder = isSortAscendant(); + String sortColumn = getSortColumn(); + + List<Poll> pollList = pollService.getParticipatedPolls(pager, + sortColumn, + ascendantOrder, + getPollenSession().getUserAccount()); + + polls = new Map[pollList.size()]; + Binder<Poll, Poll> binder = + PollenBinderHelper.getSimpleTopiaBinder(Poll.class); + int index = 0; + for (Poll poll : pollList) { + + Map<String, Object> map = binder.obtainProperties( + poll, + Poll.PROPERTY_TITLE, + Poll.PROPERTY_POLL_ID, + Poll.PROPERTY_DESCRIPTION, + Poll.PROPERTY_BEGIN_DATE, + Poll.PROPERTY_END_DATE + ); + map.put("id", poll.getTopiaId()); + Set<String> functions = getPollFunctions(poll); + map.put("functions", functions); + polls[index++] = map; + } + return SUCCESS; + } + + private Set<String> getPollFunctions(Poll poll) { + Set<String> result = Sets.newHashSet(); + result.add("vote"); + result.add("result"); + return result; + } +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -23,13 +23,15 @@ */ package org.chorem.pollen.ui.actions.json; -import org.chorem.pollen.business.persistence.UserAccount; +import com.google.common.collect.Sets; +import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.entities.PollenBinderHelper; -import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.services.impl.PollService; import org.nuiton.util.beans.Binder; import java.util.List; import java.util.Map; +import java.util.Set; /** * Obtain paginated users. @@ -70,20 +72,53 @@ @Override public String execute() throws Exception { - UserService userService = newService(UserService.class); + PollService pollService = newService(PollService.class); - List<UserAccount> allUsers = userService.getUsers(pager); + boolean ascendantOrder = isSortAscendant(); + String sortColumn = getSortColumn(); - polls = new Map[allUsers.size()]; - Binder<UserAccount, UserAccount> binder = - PollenBinderHelper.newBinder(UserAccount.class); + List<Poll> pollList = pollService.getPolls(pager, + sortColumn, + ascendantOrder); + + polls = new Map[pollList.size()]; + Binder<Poll, Poll> binder = + PollenBinderHelper.getSimpleTopiaBinder(Poll.class); int index = 0; - for (UserAccount user : allUsers) { - Map<String, Object> map = binder.obtainProperties(user); - map.put("id", user.getTopiaId()); + for (Poll poll : pollList) { + + + Map<String, Object> map = binder.obtainProperties( + poll, + Poll.PROPERTY_TITLE, + Poll.PROPERTY_POLL_ID, + Poll.PROPERTY_DESCRIPTION, + Poll.PROPERTY_BEGIN_DATE, + Poll.PROPERTY_END_DATE + ); + map.put("id", poll.getTopiaId()); + Set<String> functions = getPollFunctions(poll); + map.put("functions", functions); polls[index++] = map; } return SUCCESS; } + + protected Set<String> getPollFunctions(Poll poll) { + Set<String> result = Sets.newHashSet(); + result.add("vote"); + result.add("result"); + Boolean closed = poll.getClosed(); + if (closed == null || !closed) { + + // poll is not closed + result.add("edit"); + result.add("close"); + } + result.add("export"); + result.add("clone"); + result.add("delete"); + return result; + } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -64,7 +64,7 @@ UserAccount userAccount = userService.getEntityById(UserAccount.class, userId); Binder<UserAccount, UserAccount> binder = - PollenBinderHelper.newBinder(UserAccount.class); + PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); user = binder.obtainProperties( userAccount ); Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -72,11 +72,16 @@ UserService userService = newService(UserService.class); - List<UserAccount> allUsers = userService.getUsers(pager); + boolean ascendantOrder = isSortAscendant(); + String sortColumn = getSortColumn(); + List<UserAccount> allUsers = userService.getUsers(pager, + sortColumn, + ascendantOrder); + users = new Map[allUsers.size()]; Binder<UserAccount, UserAccount> binder = - PollenBinderHelper.newBinder(UserAccount.class); + PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); int index = 0; for (UserAccount user : allUsers) { Map<String, Object> map = binder.obtainProperties( Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -34,4 +34,9 @@ public class DisplayCreatedPolls extends PollenActionSupport { private static final long serialVersionUID = 1L; + + @Override + public String getPageLogo() { + return "Creation"; + } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-30 23:53:24 UTC (rev 3124) @@ -34,4 +34,9 @@ public class DisplayParticipatedPolls extends PollenActionSupport { private static final long serialVersionUID = 1L; + + @Override + public String getPageLogo() { + return "Vote"; + } } Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-30 23:53:24 UTC (rev 3124) @@ -52,6 +52,27 @@ <result type="json"/> </action> +  + <action name="getCreatedPolls" + class="org.chorem.pollen.ui.actions.json.GetCreatedPolls"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> + +  + <action name="getInvitedPolls" + class="org.chorem.pollen.ui.actions.json.GetInvitedPolls"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> + +  + <action name="getParticipatedPolls" + class="org.chorem.pollen.ui.actions.json.GetParticipatedPolls"> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result type="json"/> + </action> + </package> </struts> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-30 23:53:24 UTC (rev 3124) @@ -32,7 +32,6 @@ <package name="poll" extends="default" namespace="/poll"> -  <action name="createPoll" class="org.chorem.pollen.ui.actions.poll.CreatePoll"> @@ -57,14 +56,16 @@  <action name="displayCreatedPolls" class="org.chorem.pollen.ui.actions.poll.DisplayCreatedPolls"> - <result name="input">/WEB-INF/jsp/createdPolls.jsp</result> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result name="input">/WEB-INF/jsp/poll/createdList.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action>  <action name="displayParticipatedPolls" class="org.chorem.pollen.ui.actions.poll.DisplayParticipatedPolls"> - <result name="input">/WEB-INF/jsp/participatedPolls.jsp</result> + <interceptor-ref name="pollenBasicLogguedStack"/> + <result name="input">/WEB-INF/jsp/poll/participatedList.jsp</result> <result>/WEB-INF/jsp/home.jsp</result> </action> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-30 23:53:24 UTC (rev 3124) @@ -7,8 +7,16 @@ pollen.action.editUser=Edit selected user pollen.action.login=Log me In pollen.action.modify=Modify +pollen.action.pollClone=Copy the poll to create a new one +pollen.action.pollClose=Close the poll +pollen.action.pollDelete=Delete the poll +pollen.action.pollEdit=Edit poll +pollen.action.pollExport=Export poll +pollen.action.pollResult=Display poll results +pollen.action.pollVote=Vote pollen.action.register=Register pollen.action.validate=Submit +pollen.common.addingChoices=Adding choices pollen.common.administrator=Admin pollen.common.beginChoiceDate=Begin choice date pollen.common.beginDate=Begin date @@ -18,6 +26,7 @@ pollen.common.endChoiceDate=end choice date pollen.common.endDate=End date pollen.common.firstName=First name +pollen.common.functions=Functions pollen.common.lastName=Last name pollen.common.license=Licence pollen.common.login=Login @@ -56,7 +65,7 @@ pollen.fieldset.poll.general=Your poll pollen.fieldset.poll.options=Options pollen.fieldset.poll.you=You -pollen.fieldset.userInformation=Informations de l'utilisateur +pollen.fieldset.userInformation=User information pollen.fieldset.userInformation.toCreate=User informations to create pollen.fieldset.userInformation.toDelete=User informations to delete pollen.fieldset.userInformation.toUpdate=User informations to update @@ -80,8 +89,13 @@ pollen.menu.polls=Polls pollen.menu.preferences=My account pollen.menu.register=Register -pollen.title.createPoll=Nouveau sondage +pollen.title.createPoll=New poll pollen.title.myAccount=My account +pollen.title.pollsCreatedList=Polls created +pollen.title.pollsCreatedList.legend=Polls you have proposed +pollen.title.pollsInvitedList.legend=Polls for which you are invited to vote pollen.title.pollsList=Polls administration +pollen.title.pollsParticipatedList=Polls participated +pollen.title.pollsParticipatedList.legend=Polls in which you are involved pollen.title.register=Register -pollen.title.usersList=Gestion des utilisateurs +pollen.title.usersList=Users administration Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-30 23:53:24 UTC (rev 3124) @@ -7,8 +7,16 @@ pollen.action.editUser=Editer un utilisateur sélectionné pollen.action.login=M'identifier pollen.action.modify=Modifier +pollen.action.pollClone=Créer un nouveau sondage à partir de celui-ci +pollen.action.pollClose=Fermer le sondage +pollen.action.pollDelete=Supprimer le sondage +pollen.action.pollEdit=Editer le sondage +pollen.action.pollExport=Exporter le sondage +pollen.action.pollResult=Afficher les résultats du sondage +pollen.action.pollVote=Voter pollen.action.register=S'enregistrer pollen.action.validate=Valider +pollen.common.addingChoices=Ajout des choix pollen.common.administrator=Admin pollen.common.beginChoiceDate=Date de début des choix pollen.common.beginDate=Date de début @@ -18,6 +26,7 @@ pollen.common.endChoiceDate=Date de fin des choix pollen.common.endDate=Date de fin pollen.common.firstName=Prénom +pollen.common.functions=Fonctions pollen.common.lastName=Nom pollen.common.license=Licence pollen.common.login=Identifiant @@ -38,9 +47,9 @@ pollen.common.pollOption.reminder=Envoyer des emails de rappel pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage pollen.common.pollType=Type de sondage -pollen.common.voteCountingType=Type de dépouillement pollen.common.title=Titre pollen.common.userSupport=Support utilisateur +pollen.common.voteCountingType=Type de dépouillement pollen.common.x=Dépouillement pollen.error.email.required=Courriel obligatoire pollen.error.login.required=Login obligatoire @@ -83,6 +92,11 @@ pollen.menu.register=Inscrivez-vous pollen.title.createPoll=Nouveau sondage pollen.title.myAccount=Mon compte +pollen.title.pollsCreatedList=Sondages créés +pollen.title.pollsCreatedList.legend=Liste des sondages que vous avez proposés +pollen.title.pollsInvitedList.legend=Liste des sondages pour lesquels vous êtes invité à voter pollen.title.pollsList=Liste des sondages +pollen.title.pollsParticipatedList=Sondages participés +pollen.title.pollsParticipatedList.legend=Liste des sondages pour lesquels vous avez voté pollen.title.register=S'enregistrer pollen.title.usersList=Gestion des utilisateurs Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-30 23:53:24 UTC (rev 3124) @@ -137,6 +137,8 @@ <action name="home" class="org.chorem.pollen.ui.actions.PollenActionSupport"> <result>/WEB-INF/jsp/home.jsp</result> + <interceptor-ref name="i18n"/> + <interceptor-ref name="basicStack"/> <interceptor-ref name="store"> <param name="operationMode">RETRIEVE</param> </interceptor-ref> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -115,15 +115,15 @@ <label for="connection_login"> <s:text name="pollen.common.login"/> : </label> - <s:textfield key="login" size="10" required="true" theme="simple"/> + <s:textfield key="login" size="10" required="true" theme="simple" + label=''/> </li> <li> <label for="connection_password"> <s:text name="pollen.common.password"/> : </label> - <s:password key="password" - label="%{getText('pollen.common.password')}" size="10" - required="true" theme="simple"/> + <s:password key="password" size="10" required="true" + label="" theme="simple"/> </li> <li> <s:submit id="submitform" action="login" key="pollen.action.login" Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -23,39 +23,31 @@ <%@page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> -<script type="text/javascript" - src="<s:url value='/js/gridHelper.js' />"></script> +<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> + <title><s:text name="pollen.title.pollsList"/></title> <h1 class="title${pageLogo}"><s:text name="pollen.title.pollsList"/></h1> <s:url id="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> -<%--script type="text/javascript"> - - jQuery(document).ready(function () { - $.addRowSelectTopic('users'); - $.addClearSelectTopic('users'); - $.addAddRowTopic('users', '${addUrl}'); - $.addSingleRowTopic('users', 'Update', '${editUrl}', 'user.id'); - $.addSingleRowTopic('users', 'Delete', '${delUrl}', 'user.id'); - }); -</script--%> - -<sjg:grid id="users" dataType="json" href="%{loadUrl}" gridModel="users" - pager="true" pagerButtons="true" pagerInput="true" +<sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="polls" + sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" - onSelectRowTopics='users-rowSelect' editinline="true" editurl="%{loadUrl}" + onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" onCompleteTopics='users-cleanSelect' navigatorEdit="false" navigatorDelete="false" navigatorSearch="false" navigatorRefresh="false" navigatorAdd="false" viewrecords="true" rowList="10,15,20,50,100" rowNum="10"> <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="login" title='%{getText("pollen.common.login")}' sortable="false" editable="true"/> - <sjg:gridColumn name="firstName" title='%{getText("pollen.common.firstName")}' sortable="false" editable="true"/> - <sjg:gridColumn name="lastName" title='%{getText("pollen.common.lastName")}' sortable="false" editable="true"/> - <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}' sortable="false" editable="true"/> - <sjg:gridColumn name="admin" title='%{getText("pollen.common.admin")}' sortable="false" width="100" formatter="checkbox" editable="true" edittype="checkbox"/> + + <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}' /> + <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> + <sjg:gridColumn name="addingChoices" title='%{getText("pollen.common.addingChoices")}'/> + <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> + <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' + formatter="pollFunctions" width="180" sortable="false"/> </sjg:grid> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -129,7 +129,7 @@ </script> <sjg:grid id="users" dataType="json" href="%{loadUSers}" gridModel="users" - pager="true" pagerButtons="true" pagerInput="true" + sortable="true" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect' editinline="false" onCompleteTopics='users-clearSelect' @@ -143,17 +143,11 @@ delete:{ title: '%{getText(\"pollen.action.deleteUser\")}', icon: 'ui-icon-trash', topic: 'users-deleteRow' }}"> <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="login" title='%{getText("pollen.common.login")}' - sortable="false"/> - <sjg:gridColumn name="firstName" title='%{getText("pollen.common.firstName")}' - sortable="false"/> - <sjg:gridColumn name="lastName" title='%{getText("pollen.common.lastName")}' - sortable="false"/> - <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}' - sortable="false"/> - <sjg:gridColumn name="administrator" title='%{getText("pollen.common.administrator")}' - sortable="false" width="100" formatter="checkbox" - editable="true" /> + <sjg:gridColumn name="login" title='%{getText("pollen.common.login")}'/> + <sjg:gridColumn name="firstName" title='%{getText("pollen.common.firstName")}'/> + <sjg:gridColumn name="lastName" title='%{getText("pollen.common.lastName")}'/> + <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}'/> + <sjg:gridColumn name="administrator" title='%{getText("pollen.common.administrator")}'width="100" formatter="checkbox" /> </sjg:grid> <br/> Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-30 23:51:17 UTC (rev 3123) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -26,6 +26,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <br/> + <div class="center" style="margin-bottom:20px;"> <img src="<s:url value='/img/pollen_%{safeLanguage}.png' />" alt="Pollen logo"/> </div> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -0,0 +1,55 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> + +<title><s:text name="pollen.title.pollsCreatedList"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.pollsCreatedList"/></h1> + +<h4><s:text name="pollen.title.pollsCreatedList.legend"/></h4> + +<s:url id="loadUrl" action="getCreatedPolls" namespace="/json" escapeAmp="false"/> + +<sjg:grid id="polls" dataType="json" href="%{loadUrl}" gridModel="polls" + sortable="true" pager="true" pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" + onCompleteTopics='users-cleanSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10"> + <sjg:gridColumn name="id" title="id" hidden="true"/> + + <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}' /> + <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> + <sjg:gridColumn name="addingChoices" title='%{getText("pollen.common.addingChoices")}'/> + <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> + <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' + formatter="pollFunctions" width="180" sortable="false"/> +</sjg:grid> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -0,0 +1,82 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> + +<%@include file="/WEB-INF/jsp/pollListHelper.jsp"%> + +<title><s:text name="pollen.title.pollsParticipatedList"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.pollsParticipatedList"/></h1> + +<h4><s:text name="pollen.title.pollsInvitedList.legend"/></h4> + +<s:url id="loadInvitedUrl" action="getInvitedPolls" + namespace="/json" escapeAmp="false"/> + +<sjg:grid dataType="json" href="%{loadInvitedUrl}" gridModel="polls" + sortable="true" pager="true" pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" + onCompleteTopics='users-cleanSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10"> + <sjg:gridColumn name="id" title="id" hidden="true"/> + + <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}' /> + <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> + <sjg:gridColumn name="addingChoices" title='%{getText("pollen.common.addingChoices")}'/> + <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> + <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' + formatter="pollFunctions" width="180" sortable="false"/> +</sjg:grid> + + +<h4><s:text name="pollen.title.pollsParticipatedList.legend"/></h4> + +<s:url id="loadParticipatedUrl" action="getParticipatedPolls" + namespace="/json" escapeAmp="false"/> + +<sjg:grid dataType="json" href="%{loadParticipatedUrl}" gridModel="polls" + sortable="true" pager="true" pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='users-rowSelect' editurl="%{loadUrl}" + onCompleteTopics='users-cleanSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10"> + <sjg:gridColumn name="id" title="id" hidden="true"/> + + <sjg:gridColumn name="title" title='%{getText("pollen.common.title")}' /> + <sjg:gridColumn name="description" title='%{getText("pollen.common.description")}'/> + <sjg:gridColumn name="addingChoices" title='%{getText("pollen.common.addingChoices")}'/> + <sjg:gridColumn name="beginDate" title='%{getText("pollen.common.beginDate")}'/> + <sjg:gridColumn name="endDate" title='%{getText("pollen.common.endDate")}'/> + <sjg:gridColumn name="functions" title='%{getText("pollen.common.functions")}' + formatter="pollFunctions" width="180" sortable="false"/> +</sjg:grid> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-30 23:53:24 UTC (rev 3124) @@ -0,0 +1,97 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + +<s:url id="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> + +<s:url id="voteUrl" action="vote" namespace="/poll" escapeAmp="false"/> +<s:url id='voteImg' value='/img/vote.png'/> +<s:set id='voteTitle'><s:text name="pollen.action.pollVote"/></s:set> + +<s:url id="resultUrl" action="result" namespace="/poll" escapeAmp="false"/> +<s:url id='resultImg' value='/img/count.png'/> +<s:set id='resultTitle'><s:text name="pollen.action.pollResult"/></s:set> + +<s:url id="editUrl" action="edit" namespace="/poll" escapeAmp="false"/> +<s:url id='editImg' value='/img/edit.png'/> +<s:set id='editTitle'><s:text name="pollen.action.pollEdit"/></s:set> + +<s:url id="closeUrl" action="close" namespace="/poll" escapeAmp="false"/> +<s:url id='closeImg' value='/img/close.png'/> +<s:set id='closeTitle'><s:text name="pollen.action.pollClose"/></s:set> + +<s:url id="exportUrl" action="export" namespace="/poll" escapeAmp="false"/> +<s:url id='exportImg' value='/img/export.png'/> +<s:set id='exportTitle'><s:text name="pollen.action.pollExport"/></s:set> + +<s:url id="cloneUrl" action="clone" namespace="/poll" escapeAmp="false"/> +<s:url id='cloneImg' value='/img/copy.png'/> +<s:set id='cloneTitle'><s:text name="pollen.action.pollClone"/></s:set> + +<s:url id="deleteUrl" action="delete" namespace="/poll" escapeAmp="false"/> +<s:url id='deleteImg' value='/img/delete.png'/> +<s:set id='deleteTitle'><s:text name="pollen.action.pollDelete"/></s:set> + +<script type="text/javascript"> + + function pollFunctions(cellvalue, options, rowObject) { + + var id = rowObject.pollId; + + var result = ""; + + if (cellvalue.indexOf('vote') > -1) { + if (rowObject['voteId']) { + id = rowObject['voteId']; + } + result += formatLink(id, "${voteUrl}", "${voteImg}", "Vote", "${voteTitle}") + } + if (cellvalue.indexOf('result') > -1) { + result += formatLink(id, "${resultUrl}", "${resultImg}", "Result", "${resultTitle}") + } + if (cellvalue.indexOf('edit') > -1) { + result += formatLink(id, "${editUrl}", "${editImg}", "Edit", "${editTitle}") + } + if (cellvalue.indexOf('close') > -1) { + result += formatLink(id, "${closeUrl}", "${closeImg}", "Close", "${closeTitle}") + } + if (cellvalue.indexOf('export') > -1) { + result += formatLink(id, "${exportUrl}", "${exportImg}", "Export", "${exportTitle}") + } + if (cellvalue.indexOf('clone') > -1) { + result += formatLink(id, "${cloneUrl}", "${cloneImg}", "Clone", "${cloneTitle}") + } + if (cellvalue.indexOf('delete') > -1) { + result += formatLink(id, "${deleteUrl}", "${deleteImg}", "Delete", "${deleteTitle}") + } + return result; + } + function formatLink(id, baseUrl, image, imageAlt, imageTitle) { + var url = $.prepareUrl(baseUrl, {pollId:id}); + return "<a href='" + url + "'><image alt='" + imageAlt + "' title='" + imageTitle + "' src='" + image + "'> </a>"; + } +</script> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3123 - branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 30 Jan '12

30 Jan '12

Author: tchemit Date: 2012-01-31 00:51:17 +0100 (Tue, 31 Jan 2012) New Revision: 3123 Url: http://chorem.org/repositories/revision/pollen/3123 Log: - add sort on user list - add poll lists method (some are not still coded) Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-30 20:43:30 UTC (rev 3122) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-30 23:51:17 UTC (rev 3123) @@ -23,16 +23,25 @@ */ package org.chorem.pollen.services.impl; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.PollAccountImpl; +import org.chorem.pollen.business.persistence.PollDAO; import org.chorem.pollen.business.persistence.PollImpl; import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.entities.PollenDAOHelper; import org.chorem.pollen.services.PollenServiceSupport; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.util.PagerUtil; +import java.util.List; + public class PollService extends PollenServiceSupport { /** Logger. */ @@ -69,6 +78,206 @@ result.setPollId(serviceContext.createPollenUrlId()); return result; } + + public List<Poll> getPolls(PagerUtil.PagerBean pager, + String sortColumn, + boolean ascendantOrder) { + + try { + PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); + + long records = dao.count(); + pager.setRecords((int) records); + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + TopiaQuery query = dao.createQuery("e"); + addFilterToQuery(query, pager, sortColumn, ascendantOrder); + + List<Poll> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public List<Poll> getCreatedPolls(PagerUtil.PagerBean pager, + String sortColumn, + boolean ascendantOrder, + UserAccount user) { + + try { + PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); + + TopiaQuery countQuery = dao.createQuery("e"); + countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); + long records = dao.countByQuery(countQuery); + pager.setRecords((int) records); + + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + TopiaQuery query = dao.createQuery("e"); + addFilterToQuery(query, pager, sortColumn, ascendantOrder); + query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); + + List<Poll> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public List<Poll> getInvitedPolls(PagerUtil.PagerBean pager, + String sortColumn, + boolean ascendantOrder, + UserAccount user) { + + try { + PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); + + TopiaQuery countQuery = dao.createQuery("e"); + countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); + long records = dao.countByQuery(countQuery); + pager.setRecords((int) records); + + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + TopiaQuery query = dao.createQuery("e"); + addFilterToQuery(query, pager, sortColumn, ascendantOrder); + query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); + + List<Poll> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public List<Poll> getParticipatedPolls(PagerUtil.PagerBean pager, + String sortColumn, + boolean ascendantOrder, + UserAccount user) { + + try { + PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); + + TopiaQuery countQuery = dao.createQuery("e"); + countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); + long records = dao.countByQuery(countQuery); + pager.setRecords((int) records); + + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + TopiaQuery query = dao.createQuery("e"); + addFilterToQuery(query, pager, sortColumn, ascendantOrder); + query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user); + + List<Poll> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + + /* + @Override + public List<PollDTO> findParticipatedPolls(String userId) { + TopiaContext transaction = null; + List<PollDTO> results = null; + UserAccountDAO userDAO = null; + try { + transaction = rootContext.beginTransaction(); + + userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); + UserAccount user = userDAO.findByTopiaId(userId); + + Set<Poll> pollEntities = new HashSet<Poll>(); + for (PollAccount pollAccount : user.getPollAccount()) { + for (Vote vote : pollAccount.getVote()) { + pollEntities.add(vote.getPoll()); + } + } + + converter.setTransaction(transaction); + results = converter + .createPollDTOs(new ArrayList<Poll>(pollEntities)); + + transaction.commitTransaction(); + + if (log.isDebugEnabled()) { + log.debug("Entities found: " + + ((results == null) ? "null" : results.size())); + } + + return results; + } catch (Exception e) { + ContextUtil.doCatch(e, transaction); + return null; + } finally { + ContextUtil.doFinally(transaction); + } + } + + @Override + public List<PollDTO> findInvitedPolls(String userId) { + TopiaContext transaction = null; + List<PollDTO> results = null; + UserAccountDAO userDAO = null; + try { + transaction = rootContext.beginTransaction(); + + userDAO = PollenModelDAOHelper.getUserAccountDAO(transaction); + UserAccount user = userDAO.findByTopiaId(userId); + + pollDAO = PollenModelDAOHelper.getPollDAO(transaction); + List<Poll> polls = pollDAO.findAll(); + + Set<Poll> pollEntities = new HashSet<Poll>(); + for (Poll poll : polls) { + for (VotingList votingList : poll.getVotingList()) { + for (PersonToList personToList : votingList + .getPollAccountPersonToList()) { + if (!personToList.getHasVoted()) { + PollAccount pollAccount = personToList + .getPollAccount(); + if (pollAccount != null + && pollAccount.getEmail() != null + && pollAccount.getEmail().equals( + user.getEmail())) { + pollEntities.add(poll); + } + } + } + } + } + + converter.setTransaction(transaction); + results = converter + .createPollDTOs(new ArrayList<Poll>(pollEntities)); + + transaction.commitTransaction(); + + if (log.isDebugEnabled()) { + log.debug("Entities found: " + + ((results == null) ? "null" : results.size())); + } + + return results; + } catch (Exception e) { + ContextUtil.doCatch(e, transaction); + return null; + } finally { + ContextUtil.doFinally(transaction); + } + } + */ + private void addFilterToQuery(TopiaQuery query, PagerUtil.PagerBean pager, String sortColumn, boolean ascendantOrder) { + query.setLimit(pager.getRecordStartIndex(), pager.getRecordEndIndex() - 1); + if (StringUtils.isNotEmpty(sortColumn)) { + if (ascendantOrder) { + query.addOrder(sortColumn); + } else { + query.addOrderDesc(sortColumn); + } + } + } + // // /** // * Build a new Poll instance based on existing {@code poll} (copy) Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-30 20:43:30 UTC (rev 3122) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-30 23:51:17 UTC (rev 3123) @@ -201,7 +201,9 @@ } } - public List<UserAccount> getUsers(PagerUtil.PagerBean pager) { + public List<UserAccount> getUsers(PagerUtil.PagerBean pager, + String sortColumn, + boolean ascendantOrder) { try { UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); @@ -212,6 +214,14 @@ PagerUtil.computeRecordIndexesAndPagesNumber(pager); TopiaQuery query = dao.createQuery("e"); query.setLimit(pager.getRecordStartIndex(), pager.getRecordEndIndex() - 1); + + if (StringUtils.isNotEmpty(sortColumn)) { + if (ascendantOrder) { + query.addOrder(sortColumn); + } else { + query.addOrderDesc(sortColumn); + } + } List<UserAccount> result = dao.findAllByQuery(query); return result; } catch (TopiaException e) {

1 0

r3122 - in branches/pollen-1.2.6-struts2: . doc doc/images pollen-business pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence pollen-business/src/main/xmi pollen-persistence pollen-persistence/src/license pollen-persistence/src/main/java/org/chorem/pollen p
by tchemit＠users.chorem.org 30 Jan '12

30 Jan '12

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

1 0

r3121 - in branches/pollen-1.2.6-struts2: . pollen-business pollen-business/doc pollen-business/src/main/java/org/chorem/pollen/business/business pollen-business/src/main/java/org/chorem/pollen/business/converters pollen-business/src/main/java/org/chorem/pollen/business/dto pollen-business/src/main/java/org/chorem/pollen/business/migration pollen-business/src/main/java/org/chorem/pollen/business/services pollen-business/src/main/java/org/chorem/pollen/business/utils pollen-business/src/main
by tchemit＠users.chorem.org 30 Jan '12

30 Jan '12

Author: tchemit Date: 2012-01-30 02:14:44 +0100 (Mon, 30 Jan 2012) New Revision: 3121 Url: http://chorem.org/repositories/revision/pollen/3121 Log: Evolution #471: Migrates business layer Evolution #472: Migrates to struts 2 Evolution #417: Updates to ToPIA 2.6 Added: branches/pollen-1.2.6-struts2/pollen-persistence/ branches/pollen-1.2.6-struts2/pollen-persistence/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-persistence/README.txt branches/pollen-1.2.6-struts2/pollen-persistence/changelog.txt branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml branches/pollen-1.2.6-struts2/pollen-persistence/src/ branches/pollen-1.2.6-struts2/pollen-persistence/src/license/ branches/pollen-1.2.6-struts2/pollen-persistence/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo branches/pollen-1.2.6-struts2/pollen-persistence/src/test/ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/java/org/chorem/pollen/ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-services/ branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-services/README.txt branches/pollen-1.2.6-struts2/pollen-services/changelog.txt branches/pollen-1.2.6-struts2/pollen-services/pom.xml branches/pollen-1.2.6-struts2/pollen-services/src/ branches/pollen-1.2.6-struts2/pollen-services/src/license/ branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-services/src/test/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/README.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/changelog.txt branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/THIRD-PARTY.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/favicon.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1downarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1uparrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/7ter.jpg branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/close.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/contact.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/copy.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/count.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/delete.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/edit.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/editSmall.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/exclamation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/export.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed2.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/gplv3.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/help.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/import.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/lutin.gif branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep1.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep2.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep3.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/save.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_en.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_fr.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menu.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/true.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/undo.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/vote.png branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/ branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/THIRD-PARTY.properties Modified: branches/pollen-1.2.6-struts2/ branches/pollen-1.2.6-struts2/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-business/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-business/changelog.txt branches/pollen-1.2.6-struts2/pollen-business/doc/PollenBusiness.zargo branches/pollen-1.2.6-struts2/pollen-business/doc/ServicePoll.zargo branches/pollen-1.2.6-struts2/pollen-business/doc/ServiceResults.zargo branches/pollen-1.2.6-struts2/pollen-business/doc/ServiceUser.zargo branches/pollen-1.2.6-struts2/pollen-business/doc/ServiceVote.zargo branches/pollen-1.2.6-struts2/pollen-business/pom.xml branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/business/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataCommentConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataUserConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/CommentDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PersonListDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultListDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/UserDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoice.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceComment.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResults.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/MD5.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.properties branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/converters/EnumControllerTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/package-info.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceChoiceImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceCommentImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceListImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/utils/PropertiesLoaderTest.java branches/pollen-1.2.6-struts2/pollen-business/src/test/resources/pollen.properties branches/pollen-1.2.6-struts2/pollen-ui/pom.xml branches/pollen-1.2.6-struts2/pollen-votecounting/LICENSE.txt branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/log4j.properties branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java branches/pollen-1.2.6-struts2/pom.xml branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/assentiment.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/condorcet.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/depouillement.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/developer.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/historique.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/index.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/nombre.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/pourcentage.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/user.rst branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst branches/pollen-1.2.6-struts2/src/site/rst/approval.rst branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst branches/pollen-1.2.6-struts2/src/site/rst/business.rst branches/pollen-1.2.6-struts2/src/site/rst/condorcet.rst branches/pollen-1.2.6-struts2/src/site/rst/developer.rst branches/pollen-1.2.6-struts2/src/site/rst/historical.rst branches/pollen-1.2.6-struts2/src/site/rst/index.rst branches/pollen-1.2.6-struts2/src/site/rst/install.rst branches/pollen-1.2.6-struts2/src/site/rst/methods.rst branches/pollen-1.2.6-struts2/src/site/rst/number.rst branches/pollen-1.2.6-struts2/src/site/rst/percentage.rst branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst branches/pollen-1.2.6-struts2/src/site/rst/ui.rst branches/pollen-1.2.6-struts2/src/site/rst/user.rst branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst branches/pollen-1.2.6-struts2/src/site/site_en.xml branches/pollen-1.2.6-struts2/src/site/site_fr.xml Property changes on: branches/pollen-1.2.6-struts2 ___________________________________________________________________ Modified: svn:ignore - target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Modified: branches/pollen-1.2.6-struts2/LICENSE.txt =================================================================== --- branches/pollen-1.2.6-struts2/LICENSE.txt 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/LICENSE.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/doc/PollenBusiness.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-business/doc/ServicePoll.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-business/doc/ServiceResults.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-business/doc/ServiceUser.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-business/doc/ServiceVote.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: branches/pollen-1.2.6-struts2/pollen-business/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/pom.xml 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,116 +1,104 @@ <?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> - <groupId>org.chorem</groupId> - <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-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>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</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>com.h2database</groupId> - <artifactId>h2</artifactId> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-business</artifactId> - </dependencies> + <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>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</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>com.h2database</groupId> + <artifactId>h2</artifactId> + </dependency> + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  -  -  + </dependencies> - <name>Pollen :: Business</name> - <description>Partie métier de Pollen</description> - -  -  -  +  +  +  - <packaging>jar</packaging> + <name>Pollen :: Business</name> + <description>Partie métier de Pollen</description> - <build> +  +  +  - <plugins> - -  - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${eugene.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> -  - <configuration> -  - <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> + <build> + <plugins> + +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> +  + <configuration> +  + <fullPackagePath>org.chorem.pollen</fullPackagePath> +  + <defaultPackage>org.chorem.pollen.business.persistence</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer + </templates> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/business/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataCommentConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataUserConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/converters/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/CommentDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PersonListDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultListDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/UserDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/dto/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -16,19 +16,6 @@ package org.chorem.pollen.business.migration; -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.dialect.Dialect; -import org.hibernate.dialect.H2Dialect; -import org.hibernate.dialect.PostgreSQLDialect; -import org.nuiton.topia.migration.DatabaseManager; -import org.nuiton.topia.migration.callback.MigrationCallbackHandler; -import org.nuiton.util.VersionUtil; - /** * Classe d'interaction avant la migration (MigrationCallbackHandler). * @@ -36,123 +23,125 @@ * @version $Id: PollenMigrationCallbackHandler.java 2615 2009-07-01 13:47:45Z * nrannou $ */ -public class PollenMigrationCallbackHandler implements MigrationCallbackHandler { - - /** log. */ - private static final Log log = LogFactory - .getLog(PollenMigrationCallbackHandler.class); - - @Override - public MigrationChoice doMigration(DatabaseManager dbManager, - String dbVersion, String applicationVersion) { - - if (log.isInfoEnabled()) { - log.info("Migration : version de la base : " + dbVersion - + ", version de l'application : " + applicationVersion); - } - - Dialect dialect = dbManager.getDbConfiguration().buildSettings() - .getDialect(); - MigrationChoice result = MigrationChoice.NO_MIGRATION; - - // ouverture d'une connexion direct JDBC sur la base - try { - Connection conn = dbManager.getConnection(); - try { - conn.setAutoCommit(false); - if (VersionUtil.valueOf(dbVersion).before( - VersionUtil.valueOf("1.1"))) { - migrateTo1_1(conn, dialect); - } - if (VersionUtil.valueOf(dbVersion).before( - VersionUtil.valueOf("1.2"))) { - migrate1_1To1_2(conn, dialect); - } - conn.commit(); - result = MigrationChoice.CUSTOM_MIGRATION; - } catch (Exception eee) { - log.error("Migration impossible de la base", eee); - conn.rollback(); - } finally { - conn.close(); - } - } catch (Exception eee) { - log.error("Erreur lors de la tentative de migration", eee); - } - return result; - } - - /** Migration de la version 0 à 1.1 */ - private void migrateTo1_1(Connection conn, Dialect dialect) - throws SQLException { - log.info("Migrate to version 1_1"); - String[] sqls = null; - - // Script de migration - if (dialect instanceof PostgreSQLDialect) { - sqls = new String[] { - "alter table useraccount rename langage to language;", - "alter table pollaccount add accountid varchar;", - "update pollaccount set accountid=md5(topiaid);", - "alter table persontolist drop column hasvoted;", - "alter table persontolist add hasvoted boolean default false;", - "alter table vote add anonymous boolean default false;", - "alter table preventrule add active boolean default true;", - "alter table preventrule add onetime boolean default false;", }; - } else if (dialect instanceof H2Dialect) { - sqls = new String[] { - "alter table useraccount alter column langage rename to language;", - "alter table pollaccount add accountid varchar;", - "update pollaccount set accountid=hash('sha256', stringtoutf8(topiaid), 1000);", - "alter table persontolist drop column hasvoted;", - "alter table persontolist add hasvoted boolean default false;", - "alter table vote add anonymous boolean default false;", - "alter table preventrule add active boolean default true;", - "alter table preventrule add onetime boolean default false;", }; - } else { - if (log.isErrorEnabled()) { - log - .error("Migration non prise en charge pour ce type de dialect : " - + dialect); - } - } - - // Exécution de la migration - for (String sql : sqls) { - log.info("try " + sql); - PreparedStatement sta = conn.prepareStatement(sql); - sta.executeUpdate(); - log.info("done " + sql); - } - } - - /** Migration de la version 1.1 à 1.2 */ - private void migrate1_1To1_2(Connection conn, Dialect dialect) - throws SQLException { - log.info("Migrate version 1_1 to version 1_2"); - String[] sqls = null; - - // Script de migration - if (dialect instanceof PostgreSQLDialect) { - sqls = new String[] { - "alter table poll add endchoicedate timestamp without time zone;" }; - } else if (dialect instanceof H2Dialect) { - sqls = new String[] { - "alter table poll add endchoicedate timestamp before begindate;" }; - } else { - if (log.isErrorEnabled()) { - log - .error("Migration non prise en charge pour ce type de dialect : " - + dialect); - } - } - - // Exécution de la migration - for (String sql : sqls) { - log.info("try " + sql); - PreparedStatement sta = conn.prepareStatement(sql); - sta.executeUpdate(); - log.info("done " + sql); - } - } +@Deprecated +public class PollenMigrationCallbackHandler //implements MigrationCallbackHandler +{ +// +// /** log. */ +// private static final Log log = LogFactory +// .getLog(PollenMigrationCallbackHandler.class); +// +// @Override +// public MigrationChoice doMigration(DatabaseManager dbManager, +// String dbVersion, String applicationVersion) { +// +// if (log.isInfoEnabled()) { +// log.info("Migration : version de la base : " + dbVersion +// + ", version de l'application : " + applicationVersion); +// } +// +// Dialect dialect = dbManager.getDbConfiguration().buildSettings() +// .getDialect(); +// MigrationChoice result = MigrationChoice.NO_MIGRATION; +// +// // ouverture d'une connexion direct JDBC sur la base +// try { +// Connection conn = dbManager.getConnection(); +// try { +// conn.setAutoCommit(false); +// if (VersionUtil.valueOf(dbVersion).before( +// VersionUtil.valueOf("1.1"))) { +// migrateTo1_1(conn, dialect); +// } +// if (VersionUtil.valueOf(dbVersion).before( +// VersionUtil.valueOf("1.2"))) { +// migrate1_1To1_2(conn, dialect); +// } +// conn.commit(); +// result = MigrationChoice.CUSTOM_MIGRATION; +// } catch (Exception eee) { +// log.error("Migration impossible de la base", eee); +// conn.rollback(); +// } finally { +// conn.close(); +// } +// } catch (Exception eee) { +// log.error("Erreur lors de la tentative de migration", eee); +// } +// return result; +// } +// +// /** Migration de la version 0 à 1.1 */ +// private void migrateTo1_1(Connection conn, Dialect dialect) +// throws SQLException { +// log.info("Migrate to version 1_1"); +// String[] sqls = null; +// +// // Script de migration +// if (dialect instanceof PostgreSQLDialect) { +// sqls = new String[] { +// "alter table useraccount rename langage to language;", +// "alter table pollaccount add accountid varchar;", +// "update pollaccount set accountid=md5(topiaid);", +// "alter table persontolist drop column hasvoted;", +// "alter table persontolist add hasvoted boolean default false;", +// "alter table vote add anonymous boolean default false;", +// "alter table preventrule add active boolean default true;", +// "alter table preventrule add onetime boolean default false;", }; +// } else if (dialect instanceof H2Dialect) { +// sqls = new String[] { +// "alter table useraccount alter column langage rename to language;", +// "alter table pollaccount add accountid varchar;", +// "update pollaccount set accountid=hash('sha256', stringtoutf8(topiaid), 1000);", +// "alter table persontolist drop column hasvoted;", +// "alter table persontolist add hasvoted boolean default false;", +// "alter table vote add anonymous boolean default false;", +// "alter table preventrule add active boolean default true;", +// "alter table preventrule add onetime boolean default false;", }; +// } else { +// if (log.isErrorEnabled()) { +// log +// .error("Migration non prise en charge pour ce type de dialect : " +// + dialect); +// } +// } +// +// // Exécution de la migration +// for (String sql : sqls) { +// log.info("try " + sql); +// PreparedStatement sta = conn.prepareStatement(sql); +// sta.executeUpdate(); +// log.info("done " + sql); +// } +// } +// +// /** Migration de la version 1.1 à 1.2 */ +// private void migrate1_1To1_2(Connection conn, Dialect dialect) +// throws SQLException { +// log.info("Migrate version 1_1 to version 1_2"); +// String[] sqls = null; +// +// // Script de migration +// if (dialect instanceof PostgreSQLDialect) { +// sqls = new String[] { +// "alter table poll add endchoicedate timestamp without time zone;" }; +// } else if (dialect instanceof H2Dialect) { +// sqls = new String[] { +// "alter table poll add endchoicedate timestamp before begindate;" }; +// } else { +// if (log.isErrorEnabled()) { +// log +// .error("Migration non prise en charge pour ce type de dialect : " +// + dialect); +// } +// } +// +// // Exécution de la migration +// for (String sql : sqls) { +// log.info("try " + sql); +// PreparedStatement sta = conn.prepareStatement(sql); +// sta.executeUpdate(); +// log.info("done " + sql); +// } +// } } Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/migration/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoice.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceComment.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -520,7 +520,7 @@ } pollEntity.addVote(voteEntity); - pollEntity.update(); + pollDAO.update(pollEntity); transaction.commitTransaction(); Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResults.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -241,7 +241,7 @@ UserAccount userEntity = userDAO.findByTopiaId(user.getId()); userEntity.setPassword(newPassword); - userEntity.update(); + userDAO .update(userEntity); transaction.commitTransaction(); if (log.isDebugEnabled()) { Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -134,7 +134,7 @@ Vote voteEntity = voteDAO.findByTopiaId(voteDTO.getId()); converter.setTransaction(transaction); converter.populateVoteEntity(voteDTO, voteEntity); - voteEntity.update(); + voteDAO.update(voteEntity); transaction.commitTransaction(); @@ -159,7 +159,7 @@ voteDAO = PollenModelDAOHelper.getVoteDAO(transaction); Vote voteEntity = voteDAO.findByTopiaId(voteId); - voteEntity.delete(); + voteDAO.delete(voteEntity); transaction.commitTransaction(); @@ -207,7 +207,7 @@ " WHERE poll.pollId = :pollUId" + " ORDER BY topiaCreateDate", startIndex, endIndex, - "pollUId", poll.getPollId()); + new Object[]{"pollUId", poll.getPollId()}); if (log.isDebugEnabled()) { log.debug("Nb votes found : " + votes.size()); Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/services/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/MD5.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -16,6 +16,9 @@ package org.chorem.pollen.business.utils; +import java.io.File; +import java.io.IOException; +import java.net.URL; import java.util.Properties; import org.apache.commons.logging.Log; @@ -49,7 +52,7 @@ //URL url = Resource.getURL(filename); //conf.load(url.openStream()); - Properties confAll = Resource.getConfigProperties(filename); + Properties confAll = getConfigProperties(filename); for (String key : confAll.stringPropertyNames()) { conf.setProperty(key, confAll.getProperty(key)); } @@ -66,4 +69,82 @@ return conf; } + + /** + * Recherche et retourne l'objet properties de configuration à utiliser. + * <p/> + * Les différents fichiers trouvé sont chainé. L'ordre de recherche est le + * classpath, le fichier dans /etc et enfin le chemin sur le filesystem. + * + * @param filename le nom du fichier à rechercher + * @return l'objet Properties de configuration + * @throws IOException si une erreur est survenue + * @deprecated since 1.1.2, use {@link org.nuiton.util.ApplicationConfig} class instead + * to {@link org.nuiton.util.ApplicationConfig#setConfigFileName(java.lang.String) } + * and search properties file from more folders with + * {@link org.nuiton.util.ApplicationConfig#parse(java.lang.String[]) } method + */ + @Deprecated + static public Properties getConfigProperties(String filename) + throws IOException { + Properties result; + result = getConfigProperties(filename, null); + return result; + } + + /** + * Recherche et retourne l'objet properties de configuration à utiliser. + * <p/> + * Les différents fichiers trouvé sont chainé. L'ordre de recherche est le + * classpath, le fichier dans /etc et enfin le chemin sur le filesystem. + * + * @param filename le nom du fichier à rechercher + * @param parent les proprietes parent a surcharger + * @return l'objet Properties de configuration + * @throws IOException si une erreur est survenue + * @deprecated since 1.1.2, use {@link org.nuiton.util.ApplicationConfig} class instead + * to {@link org.nuiton.util.ApplicationConfig#setConfigFileName(java.lang.String) } + * and search properties file from more folders with + * {@link org.nuiton.util.ApplicationConfig#parse(java.lang.String[]) } method + */ + @Deprecated + static public Properties getConfigProperties(String filename, + Properties parent) throws IOException { + Properties result; + if (parent != null) { + result = new Properties(parent); + } else { + result = new Properties(); + } + + URL inClasspath = ClassLoader.getSystemClassLoader().getResource( + filename); + if (inClasspath == null) { + inClasspath = Resource.class.getResource(filename); + } + if (inClasspath == null) { + inClasspath = Resource.getURLOrNull(filename); + } + if (inClasspath != null) { + log.info("Chargement du fichier de config: " + inClasspath); + result.load(inClasspath.openStream()); + result = new Properties(result); + } + + File etcConfig = new File("/etc/" + filename); + if (etcConfig.exists()) { + log.info("Chargement du fichier de config: " + etcConfig); + result.load(etcConfig.toURI().toURL().openStream()); + result = new Properties(result); + } + + File config = new File(filename); + if (config.exists()) { + log.info("Chargement du fichier de config: " + config); + result.load(config.toURI().toURL().openStream()); + result = new Properties(result); + } + + return result; + } } Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/java/org/chorem/pollen/business/utils/package-info.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.properties 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/main/xmi/pollen.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,4 +1,4 @@ -# Pr\u00E9cise l'ent\u00EAte de l'ensemble des fichiers g\u00E9n\u00E9r\u00E9s -model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Pollen\n *##%*/ +model.tagvalue.notGenerateToString=true #model.tagvalue.dbSchema=Pollen -model.tagvalue.java.lang.String=text \ No newline at end of file +model.tagvalue.constantPrefix=PROPERTY_ +model.tagvalue.java.lang.String=text Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/converters/EnumControllerTest.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -143,11 +143,11 @@ voteToChoices.add(voteToChoice2); myNewVote.setChoiceVoteToChoice(voteToChoices); - myNewVote.update(); + voteDAO.update(myNewVote); poll.getVote().add(myNewVote); } - poll.update(); + pollDAO.update(poll); context.commitTransaction(); context.closeContext(); @@ -210,11 +210,11 @@ } myNewVote.setChoiceVoteToChoice(voteToChoices); - myNewVote.update(); + voteDAO.update(myNewVote); poll.getVote().add(myNewVote); } - poll.update(); + pollDAO.update(poll); context.commitTransaction(); context.closeContext(); Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/scaling/package-info.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceChoiceImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceCommentImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceListImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Rev Revision" + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/java/org/chorem/pollen/business/utils/PropertiesLoaderTest.java ___________________________________________________________________ Modified: svn:keywords - Date Author Revision Rev Id + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-business/src/test/resources/pollen.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml Added: branches/pollen-1.2.6-struts2/pollen-persistence/LICENSE.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/LICENSE.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/LICENSE.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Added: branches/pollen-1.2.6-struts2/pollen-persistence/README.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/README.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/README.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,5 @@ +POLLEN BUSINESS +--------------- + +Pollen Business est le module qui assure la partie m�tier de Pollen. +Il g�re la persistence des donn�es en base et d�fini des services. Added: branches/pollen-1.2.6-struts2/pollen-persistence/changelog.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/changelog.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/changelog.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,4 @@ +ChangeLog + +1.0.0 +- initiale release Added: branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,147 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-persistence</artifactId> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</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>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> + <scope>test</scope> + </dependency> +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + </dependencies> + +  +  +  + + <name>Pollen :: Persistence</name> + <description>Pollen Persistence Layer</description> + + <build> + + <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.entities</defaultPackage> + <templates> + org.nuiton.topia.generator.TopiaMetaTransformer, + org.nuiton.topia.generator.BinderHelperTransformer, + org.nuiton.topia.generator.QueryHelperTransformer + </templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </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> + </executions> + </plugin> + </plugins> + </build> + +</project> + Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/license/THIRD-PARTY.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/license/THIRD-PARTY.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,27 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GNU Affero General Public License version 3 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 30 01:31:24 CET 2012 +antlr--antlr--2.7.6=BSD License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,286 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id: PollenConfiguration.java 3097 2012-01-20 16:48:46Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persiste… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.builder.ReflectionToStringBuilder; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.FileUtil; +import org.nuiton.util.Version; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.Properties; + +/** + * EchoBase configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class PollenConfiguration { + + /** Logger. */ + protected static final Log log = + LogFactory.getLog(PollenConfiguration.class); + + /** Delegate application config object containing configuration. */ + protected ApplicationConfig applicationConfig; + + public PollenConfiguration() { + this("pollen.properties"); + } + + public PollenConfiguration(String file) { + + applicationConfig = new ApplicationConfig(); + applicationConfig.setConfigFileName(file); + + if (log.isInfoEnabled()) { + log.info(this + " is initializing..."); + } + try { + applicationConfig.loadDefaultOptions(PollenConfigurationOption.class); + applicationConfig.parse(); + } catch (ArgumentsParserException e) { + throw new PollenTechnicalException( + "Could not parse configuration", e); + } + + createDirectory(PollenConfigurationOption.EMAIL_DIR); + createDirectory(PollenConfigurationOption.FEED_DIR); + createDirectory(PollenConfigurationOption.IMG_DIR); + + if (log.isDebugEnabled()) { + log.debug("parsed options in config file" + applicationConfig.getOptions()); + } + } + + public List<String> getDefaultChoiceTypes() { + ApplicationConfig.OptionList result = applicationConfig.getOptionAsList( + PollenConfigurationOption.DEFAULT_CHOICE_TYPES.key); + return result.getOption(); + } + + public List<String> getDefaultVoteCountings() { + ApplicationConfig.OptionList result = applicationConfig.getOptionAsList( + PollenConfigurationOption.DEFAULT_VOTE_COUNTINGS.key); + return result.getOption(); + } + + public List<String> getDefaultPollTypes() { + ApplicationConfig.OptionList result = applicationConfig.getOptionAsList( + PollenConfigurationOption.DEFAULT_POLL_TYPES.key); + return result.getOption(); + } + + public String getAdminLogin() { + String result = applicationConfig.getOption( + PollenConfigurationOption.ADMIN_LOGIN.key); + return result; + } + + public String getAdminPassword() { + String result = applicationConfig.getOption( + PollenConfigurationOption.ADMIN_PASSWORD.key); + return result; + } + + public String getAdminEmail() { + String result = applicationConfig.getOption( + PollenConfigurationOption.ADMIN_EMAIL.key); + return result; + } + + public String getContactEmail() { + String result = applicationConfig.getOption( + PollenConfigurationOption.CONTACT_EMAIL.key); + return result; + } + + public String getEmailHost() { + String result = applicationConfig.getOption( + PollenConfigurationOption.EMAIL_HOST.key); + return result; + } + + public int getEmailPort() { + int result = applicationConfig.getOptionAsInt( + PollenConfigurationOption.EMAIL_PORT.key); + return result; + } + + public String getEmailFrom() { + String result = applicationConfig.getOption( + PollenConfigurationOption.EMAIL_FROM.key); + return result; + } + + public File getEmailDirectory() { + File result = applicationConfig.getOptionAsFile( + PollenConfigurationOption.EMAIL_DIR.key); + return result; + } + + public File getFeedDirectory() { + File result = applicationConfig.getOptionAsFile( + PollenConfigurationOption.FEED_DIR.key); + return result; + } + + public File getImageDirectory() { + File result = applicationConfig.getOptionAsFile( + PollenConfigurationOption.IMG_DIR.key); + return result; + } + + public int getNbVotesPerPage() { + int result = applicationConfig.getOptionAsInt( + PollenConfigurationOption.NB_VOTES_PER_PAGE.key); + return result; + } + + public String getCharset() { + String result = applicationConfig.getOption( + PollenConfigurationOption.CHARSET.key); + return result; + } + + public Version getVersion() { + Version result = applicationConfig.getOptionAsVersion( + PollenConfigurationOption.VERSION.key); + return result; + } + + public void setAdminLogin(String adminLogin) { + applicationConfig.setOption( + PollenConfigurationOption.ADMIN_LOGIN.key, adminLogin); + } + + public void setAdminPassword(String adminPassword) { + applicationConfig.setOption( + PollenConfigurationOption.ADMIN_PASSWORD.key, adminPassword); + } + + public void setAdminEmail(String adminEmail) { + applicationConfig.setOption( + PollenConfigurationOption.ADMIN_EMAIL.key, adminEmail); + } + + public void setContactEmail(String contactEmail) { + applicationConfig.setOption( + PollenConfigurationOption.CONTACT_EMAIL.key, contactEmail); + } + + public void setEmailHost(String emailHost) { + applicationConfig.setOption( + PollenConfigurationOption.EMAIL_HOST.key, emailHost); + } + + public void setEmailPort(int emailPort) { + applicationConfig.setOption( + PollenConfigurationOption.EMAIL_PORT.key, String.valueOf(emailPort)); + } + + public void setEmailFrom(String emailFrom) { + applicationConfig.setOption( + PollenConfigurationOption.EMAIL_FROM.key, emailFrom); + } + + public void setEmailDirectory(File emailDirectory) { + applicationConfig.setOption( + PollenConfigurationOption.EMAIL_DIR.key, + emailDirectory.getAbsolutePath()); + } + + public void setFeedDirectory(File feedDirectory) { + applicationConfig.setOption( + PollenConfigurationOption.FEED_DIR.key, + feedDirectory.getAbsolutePath()); + } + + public void setImageDirectory(File imageDirectory) { + applicationConfig.setOption( + PollenConfigurationOption.IMG_DIR.key, + imageDirectory.getAbsolutePath()); + } + + public void setNbVotesPerPage(int nbVotesPerPage) { + applicationConfig.setOption( + PollenConfigurationOption.NB_VOTES_PER_PAGE.key, + String.valueOf(nbVotesPerPage)); + } + + public void setCharset(String charset) { + applicationConfig.setOption( + PollenConfigurationOption.CHARSET.key, charset); + } + + + @Override + public String toString() { + return ReflectionToStringBuilder.toString(this); + } + + public Properties getProperties() { + Properties result = applicationConfig.getFlatOptions(); + return result; + } + + public boolean getOptionAsBoolean(String propertyName) { + Boolean result = applicationConfig.getOptionAsBoolean(propertyName); + return result != null && result; + } + + /** + * Creates a directory given the configuration given key. + * + * @param key the configuration option key which contains the location of + * the directory to create + */ + private void createDirectory(PollenConfigurationOption key) { + + File directory = applicationConfig.getOptionAsFile(key.getKey()); + + Preconditions.checkNotNull( + directory, + "Could not find directory " + directory + " (key " + + key + + "in your configuration file named echobase.properties)" + ); + if (log.isInfoEnabled()) { + log.info(key + " = " + directory); + } + try { + FileUtil.createDirectoryIfNecessary(directory); + } catch (IOException e) { + throw new PollenTechnicalException( + "Could not create directory " + directory, e); + } + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,143 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id: PollenConfigurationOption.java 3097 2012-01-20 16:48:46Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persiste… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.Version; + +import java.io.File; +import java.util.List; + +/** + * All EchoBase configuration options. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public enum PollenConfigurationOption implements ApplicationConfig.OptionDef { + + /** login for default admin. */ + DATA_DIR("pollen.dataDirectory", "Default directory where to put datas", "${HOME}/.pollen", File.class), + /** login for default admin. */ + ADMIN_LOGIN("adminLogin", "login for default admin", "admin", String.class), + /** password for default admin. */ + ADMIN_PASSWORD("adminPassword", "password for default admin", "pollen", String.class), + /** email for default admin. */ + ADMIN_EMAIL("adminEmail", "email for default admin", "admin(a)domain.com", String.class), + /** email for contact link. */ + CONTACT_EMAIL("contactEmail", "email for contact link", "", String.class), + /** host for email sending configuration. */ + EMAIL_HOST("email_host", "host for email sending configuration", "smtp", String.class), + /** port for email sending configuration. */ + EMAIL_PORT("email_port", "port for email sending configuration", "25", String.class), + /** from for email sending configuration. */ + EMAIL_FROM("email_from", "from for email sending configuration", "bot(a)pollen.org", String.class), + /** directory to store emails before sending them. */ + EMAIL_DIR("pollen.emails.directory", "directory to store emails before sending them", "${pollen.dataDirectory}/emails", File.class), + /** path for feed directory. */ + FEED_DIR("feedDir", "path for feed directory", "${pollen.dataDirectory}/feeds", File.class), + /** path for uploaded images directory. */ + IMG_DIR("upImgDir", "path for uploaded images directory", "${pollen.dataDirectory}/uploadedImages", File.class), + /** nb votes to display per page. */ + NB_VOTES_PER_PAGE("pollen.ui.nbVotesPerPage", "nb votes to display per page", "25", int.class), + /** Charset of Pollen. */ + CHARSET("pollen.charset", "Charset of Pollen", "UTF-8", String.class), + + /** Default poll types to create on empty db. */ + DEFAULT_POLL_TYPES("pollen.pollTypes", "Default poll types to create on empty db", "RESTRICTED,FREE,GROUP", List.class), + /** Default vote countings to create on empty db. */ + DEFAULT_VOTE_COUNTINGS("pollen.voteCountings", "Default vote countings to create on empty db", "NORMAL,PERCENTAGE,CONDORCET,NUMBER", List.class), + /** Default choice types to create on empty db. */ + DEFAULT_CHOICE_TYPES("pollen.voteCountings", "Default choice types to create on empty db", "DATE,IMAGE,TEXT", List.class), + + /** Pollen version. */ + VERSION("pollen.version", "Version de l'application", "", Version.class); + + /** Configuration key. */ + protected final String key; + + /** I18n key of option description */ + protected final String description; + + /** Type of option */ + protected final Class<?> type; + + /** Default value of option. */ + protected String defaultValue; + + PollenConfigurationOption(String key, + String description, + String defaultValue, + Class<?> type) { + this.key = key; + this.description = description; + this.defaultValue = defaultValue; + this.type = type; + } + + @Override + public String getKey() { + return key; + } + + @Override + public Class<?> getType() { + return type; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public String getDefaultValue() { + return defaultValue; + } + + @Override + public boolean isTransient() { + return true; + } + + @Override + public boolean isFinal() { + return true; + } + + @Override + public void setDefaultValue(String defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public void setTransient(boolean newValue) { + // not used + } + + @Override + public void setFinal(boolean newValue) { + // not used + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,52 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id: PollenFunctions.java 3101 2012-01-23 10:32:33Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persiste… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +import com.google.common.base.Function; +import org.chorem.pollen.business.persistence.UserAccount; +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * USefull pollen functions. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenFunctions { + + public static final Function<TopiaEntity, String> ENTITY_BY_ID = new Function<TopiaEntity, String>() { + @Override + public String apply(TopiaEntity input) { + return input.getTopiaId(); + } + }; + + public static final Function<UserAccount, String> USER_BY_LOGIN = new Function<UserAccount, String>() { + @Override + public String apply(UserAccount input) { + return input.getLogin(); + } + }; + +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,48 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id: PollenTechnicalException.java 3097 2012-01-20 16:48:46Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persiste… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class PollenTechnicalException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public PollenTechnicalException() { + } + + public PollenTechnicalException(String message) { + super(message); + } + + public PollenTechnicalException(String message, Throwable cause) { + super(message, cause); + } + + public PollenTechnicalException(Throwable cause) { + super(cause); + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,127 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id: PollenTopiaRootContextFactory.java 3108 2012-01-23 22:27:46Z tchemit $ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persiste… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +import com.google.common.collect.Sets; +import com.google.common.io.Closeables; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaContextFactory; +import org.nuiton.topia.TopiaNotFoundException; +import org.nuiton.topia.TopiaRuntimeException; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; +import java.util.Set; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class PollenTopiaRootContextFactory { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenTopiaRootContextFactory.class); + + public TopiaContext newEmbeddedDatabase(File dir, String configPath) { + + File databaseFile = new File(dir, "db"); + + String databaseAbsolutePath = databaseFile.getAbsolutePath(); + + // prepare call to topia-context factory + Properties properties = new Properties(); + InputStream input = null; + try { + input = getClass().getResourceAsStream(configPath); + properties.load(input); + } catch (IOException e) { + throw new PollenTechnicalException(e); + } finally { + Closeables.closeQuietly(input); + } + properties.setProperty( + TopiaContextFactory.CONFIG_URL, + "jdbc:h2:file:" + databaseAbsolutePath + "/pollen"); + + // add entities to the context + properties.setProperty( + TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES, + PollenDAOHelper.getImplementationClassesAsString()); + + TopiaContext rootContext; + try { + rootContext = TopiaContextFactory.getContext(properties); + } catch (TopiaNotFoundException e) { + throw new TopiaRuntimeException(e); + } + + if (log.isDebugEnabled()) { + log.debug("will output database in " + databaseAbsolutePath); + } + + return rootContext; + } + + public TopiaContext newDatabaseFromConfig(PollenConfiguration config) { + + Properties properties = config.getProperties(); + + return newDatabaseFromProperties(properties); + } + + public TopiaContext newDatabaseFromProperties(Properties properties) { + + if (log.isDebugEnabled()) { + log.debug("Database settings are :"); + Set<String> keysToDisplay = Sets.newHashSet( + "hibernate.dialect", + "hibernate.connection.driver_class", + "hibernate.connection.url", + "hibernate.connection.username"); + for (String key : keysToDisplay) { + log.debug(String.format("%s=%s", key, properties.getProperty(key))); + } + } + + // add entities to the context + String classesKey = TopiaContextFactory.CONFIG_PERSISTENCE_CLASSES; + String classesValue = PollenDAOHelper.getImplementationClassesAsString(); + properties.setProperty(classesKey, classesValue); + + TopiaContext rootContext; + try { + rootContext = TopiaContextFactory.getContext(properties); + } catch (TopiaNotFoundException e) { + throw new TopiaRuntimeException(e); + } + + return rootContext; + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,50 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.business.persistence; + +import org.apache.commons.lang3.StringUtils; + +public class UserAccountImpl extends UserAccountAbstract { + + private static final long serialVersionUID = 1L; + + @Override + public String getDisplayName() { + String result = ""; + if (StringUtils.isNotEmpty(firstName)) { + result = firstName; + } + if (StringUtils.isNotEmpty(lastName)) { + result += " " + lastName; + } + if (StringUtils.isEmpty(result)) { + result = getEmail(); + } + if (StringUtils.isEmpty(result)) { + result = getLogin(); + } + return result; + } + +} //UserAccountImpl Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,93 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import org.chorem.pollen.entities.PollenDAOHelper; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; + +import java.util.List; + +/** + * Pollen Migration callback. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollenMigrationCallback extends TopiaMigrationCallbackByClass { + + public static final Version V_1_1 = VersionUtil.valueOf("1.1"); + + public static final Version V_1_2 = VersionUtil.valueOf("1.2"); + + public static final Version V_1_2_6 = VersionUtil.valueOf("1.2.6"); + + /** Les versions de mise à jour disponibles. */ + public static final Version[] AVAILABLE_VERSIONS = new Version[]{ + V_1_1, V_1_2, V_1_2_6 + }; + + public PollenMigrationCallback() { + super(new T3MigrationCallBackForVersionResolver()); + } + + @Override + public Version[] getAvailableVersions() { + return AVAILABLE_VERSIONS; + } + + @Override + public Version getApplicationVersion() { + return VersionUtil.valueOf(PollenDAOHelper.getModelVersion()); + } + + @Override + public boolean askUser(Version version, List<Version> versions) { + return true; + } + + /** + * Migration resolver for each version. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.0.1 + */ + public static class T3MigrationCallBackForVersionResolver implements MigrationCallBackForVersionResolver { + + @Override + public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { + + String fqn = PollenMigrationCallback.class.getName() + "V" + version.getValidName(); + Class<?> klass; + try { + klass = Class.forName(fqn); + } catch (ClassNotFoundException e) { + throw new IllegalStateException( + "Could not find migration class " + fqn, e); + } + return (Class<? extends MigrationCallBackForVersion>) klass; + } + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,86 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.PostgreSQLDialect; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; + +import java.util.Arrays; +import java.util.List; + +/** + * Migration for version {@code 1.1}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollenMigrationCallbackV1_1 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + public PollenMigrationCallbackV1_1(TopiaMigrationCallbackByClass callBack) { + super(PollenMigrationCallback.V_1_1, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + + Dialect dialect = + Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); + + String[] sqls = null; + + // Script de migration + if (dialect instanceof PostgreSQLDialect) { + sqls = new String[]{ + "alter table useraccount rename langage to language;", + "alter table pollaccount add accountid varchar;", + "update pollaccount set accountid=md5(topiaid);", + "alter table persontolist drop column hasvoted;", + "alter table persontolist add hasvoted boolean default false;", + "alter table vote add anonymous boolean default false;", + "alter table preventrule add active boolean default true;", + "alter table preventrule add onetime boolean default false;",}; + } else if (dialect instanceof H2Dialect) { + sqls = new String[]{ + "alter table useraccount alter column langage rename to language;", + "alter table pollaccount add accountid varchar;", + "update pollaccount set accountid=hash('sha256', stringtoutf8(topiaid), 1000);", + "alter table persontolist drop column hasvoted;", + "alter table persontolist add hasvoted boolean default false;", + "alter table vote add anonymous boolean default false;", + "alter table preventrule add active boolean default true;", + "alter table preventrule add onetime boolean default false;",}; + } + + queries.addAll(Arrays.asList(sqls)); + + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,71 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import org.hibernate.dialect.Dialect; +import org.hibernate.dialect.H2Dialect; +import org.hibernate.dialect.PostgreSQLDialect; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; + +import java.util.Arrays; +import java.util.List; + +/** + * Migration for version {@code 1.2}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + public PollenMigrationCallbackV1_2(TopiaMigrationCallbackByClass callBack) { + super(PollenMigrationCallback.V_1_1, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + + Dialect dialect = + Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); + + String[] sqls = null; + + if (dialect instanceof PostgreSQLDialect) { + sqls = new String[]{ + "alter table poll add endchoicedate timestamp without time zone;"}; + } else if (dialect instanceof H2Dialect) { + sqls = new String[]{ + "alter table poll add endchoicedate timestamp before begindate;"}; + } + + queries.addAll(Arrays.asList(sqls)); + + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,64 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; + +import java.util.List; + +/** + * Migration for version {@code 1.2.6}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.2.6 + */ +public class PollenMigrationCallbackV1_2_6 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + public PollenMigrationCallbackV1_2_6(TopiaMigrationCallbackByClass callBack) { + super(PollenMigrationCallback.V_1_2_6, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + +// Dialect dialect = +// Dialect.getDialect(tx.getHibernateConfiguration().getProperties()); +// +// if (dialect instanceof PostgreSQLDialect) { +// +// } else if (dialect instanceof H2Dialect) { +// } + + // let's use a primitive boolean + queries.add("update useraccount set administrator = false where administrator is null;"); + + + } +} Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_en_GB.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,13 @@ +pollen.exception.favorite_list_name_exist= +pollen.exception.participant_doubloons= +pollen.exception.participant_exist= +pollen.exception.participant_exist_without_email= +pollen.exception.poll_exist= +pollen.exception.poll_not_exist=No such poll exists. Please make sure that you are using the correct link and copy it completely into your browser's address field. +pollen.exception.smtp_not_available= +pollen.exception.user_email_exist= +pollen.exception.user_login_exist= +pollen.exception.user_not_exist= +pollen.exception.user_wrong_password= +pollen.exception.vote_doubloon= +pollen.exception.vote_not_allowed= Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/resources/i18n/pollen-persistence_fr_FR.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,13 @@ +pollen.exception.favorite_list_name_exist=La liste %1$s existe déjà pour l'utilisateur %2$s +pollen.exception.participant_doubloons=Les doublons de la liste %1$s ont été ignorés \: %2$s +pollen.exception.participant_exist=La liste %1$s contient déjà un votant nommé %2$s avec un email %3$s +pollen.exception.participant_exist_without_email=La liste %1$s contient déjà un votant nommé %2$s avec aucun email +pollen.exception.poll_exist= +pollen.exception.poll_not_exist=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complètement dans le champ d'adresse de votre navigateur. +pollen.exception.smtp_not_available=Impossible d'envoyer un email à %1$s. Serveur smtp indisponible pour l'envoi d'email, veuillez contacter un administrateur. +pollen.exception.user_email_exist=Un utilisateur est déjà enregistré avec cet email. +pollen.exception.user_login_exist=Un utilisateur est déjà enregistré avec cet identifiant. +pollen.exception.user_not_exist=L'identifiant '%1$s' ne correspond à aucun utilisateur connu. +pollen.exception.user_wrong_password=Le mot de passe renseigné est incorrect pour l'utilisateur '%1$s'. +pollen.exception.vote_doubloon= +pollen.exception.vote_not_allowed= Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,28 @@ +### +# #%L +# Pollen :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +model.tagvalue.notGenerateToString=true +#model.tagvalue.dbSchema=Pollen +model.tagvalue.constantPrefix=PROPERTY_ +model.tagvalue.java.lang.String=text +model.tagvalue.version=1.2.6 Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.zargo ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id: largemaillist.sh 3096 2012-01-19 23:57:08Z tchemit $ +# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-persiste… $ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +#!/bin/sh + +for i in `seq 0 3000`; do echo "\"Test $i\",\"toto+pollen+$i(a)domain.com\",1" >> test3000.csv; done Added: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ +### +# #%L +# Pollen :: Persistence +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +# Default to info level output; this is very handy if you eventually use Hibernate as well. +log4j.rootCategory=warn, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n + +log4j.logger.org.chorem.pollen=debug + +log4j.logger.org.chorem.pollen.business.PollenContextImpl=warn +log4j.logger.org.chorem.pollen.business.services.SendMail=warn Property changes on: branches/pollen-1.2.6-struts2/pollen-services ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml Added: branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-services/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/README.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/README.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/README.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,5 @@ +POLLEN BUSINESS +--------------- + +Pollen Business est le module qui assure la partie métier de Pollen. +Il gère la persistence des données en base et défini des services. Property changes on: branches/pollen-1.2.6-struts2/pollen-services/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/changelog.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/changelog.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/changelog.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,4 @@ +ChangeLog + +1.0.0 +- initiale release Property changes on: branches/pollen-1.2.6-struts2/pollen-services/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/pom.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,126 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-services</artifactId> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-persistence</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>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</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> + +  +  +  + + <name>Pollen :: Services</name> + <description>Pollen Service Layer</description> + + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + Property changes on: branches/pollen-1.2.6-struts2/pollen-services/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,29 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD style +# - CDDL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - GNU Affero General Public License version 3 +# - GPLv2+CE +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 30 01:32:21 CET 2012 +antlr--antlr--2.7.6=BSD License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,127 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.bean; + + +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class UserPoll implements Serializable { + + private static final long serialVersionUID = 7293352208965578801L; + + public static final String PROPERTY_POLL = "poll"; + + public static final String PROPERTY_ACCOUNTS = "accounts"; + + public static final String PROPERTY_CREATOR = "creator"; + + protected Boolean creator; + + protected Poll poll; + + protected List<PollAccount> accounts; + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + public boolean isCreator() { + // Lazy initialization of creator boolean + if (creator == null) { + for (PollAccount account : accounts) { + if (account.equals(poll.getCreator())) { + creator = true; + break; + } + } + if (creator == null) { + creator = false; + } + } + return creator; + } + + public String getPollUid() { + return poll.getPollId(); + } + + public List<PollAccount> getAccounts() { + if (accounts == null) { + accounts = new ArrayList<PollAccount>(); + } + return accounts; + } + + public boolean addAccount(PollAccount account) { + boolean result = getAccounts().add(account); + return result; + } + + public Poll getPoll() { + return poll; + } + + public void setPoll(Poll poll) { + Poll oldValue = getPoll(); + this.poll = poll; + firePropertyChange(PROPERTY_POLL, oldValue, poll); + } + + + public void setAccounts(List<PollAccount> accounts) { + List<PollAccount> oldValue = getAccounts(); + this.accounts = accounts; + firePropertyChange(PROPERTY_ACCOUNTS, oldValue, accounts); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + protected void firePropertyChange(String propertyName, Object newValue) { + firePropertyChange(propertyName, null, newValue); + } + +} //UserPoll Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,126 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.PollenConfiguration; +import org.nuiton.topia.TopiaContext; + +import java.util.Date; +import java.util.Locale; +import java.util.UUID; + +/** + * Instances of this class will be given to service factory. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class DefaultPollenServiceContext implements PollenServiceContext { + + protected TopiaContext transaction; + + protected PollenServiceFactory serviceFactory; + + protected PollenConfiguration configuration; + + protected Locale locale; + + public static PollenServiceContext newContext( + PollenServiceContext serviceContext, + TopiaContext transaction) { + return newContext(serviceContext.getLocale(), + transaction, + serviceContext.getConfiguration(), + serviceContext.getServiceFactory() + ); + } + + public static PollenServiceContext newContext( + Locale locale, + TopiaContext transaction, + PollenConfiguration configuration, + PollenServiceFactory serviceFactory) { + return new DefaultPollenServiceContext(locale, + transaction, + configuration, + serviceFactory); + } + + protected DefaultPollenServiceContext(Locale locale, + TopiaContext transaction, + PollenConfiguration configuration, + PollenServiceFactory serviceFactory) { + this.locale = locale; + this.transaction = transaction; + this.configuration = configuration; + this.serviceFactory = serviceFactory; + } + + @Override + public TopiaContext getTransaction() { + Preconditions.checkNotNull(transaction); + return transaction; + } + + @Override + public void setTransaction(TopiaContext transaction) { + this.transaction = transaction; + } + + @Override + public Locale getLocale() { + return locale; + } + + @Override + public <E extends PollenService> E newService(Class<E> clazz) { + return serviceFactory.newService(clazz, this); + } + + @Override + public PollenConfiguration getConfiguration() { + return configuration; + } + + @Override + public PollenServiceFactory getServiceFactory() { + return serviceFactory; + } + + /** + * Create an id to easily managed polls using urls. + * + * @return a fresh generated String + */ + @Override + public String createPollenUrlId() { + return UUID.randomUUID().toString().replaceAll("-", ""); + } + + @Override + public Date getCurrentTime() { + return new Date(); + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,39 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +package org.chorem.pollen.services; + +/** + * Contract to place on each EchBase service to push the {@code serviceContext} + * inside the service. + * + * @author tchemit <chemit(a)codelutin.com> + * @see PollenServiceContext + * @since 0.1 + */ +public interface PollenService { + + void setServiceContext(PollenServiceContext serviceContext); + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,67 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +package org.chorem.pollen.services; + +import org.chorem.pollen.PollenConfiguration; +import org.nuiton.topia.TopiaContext; + +import java.util.Date; +import java.util.Locale; + +/** + * This contract represents objects you must provide when asking for a service. + * Objects provided may be injected in services returned by + * {@link PollenServiceFactory#newService(Class, PollenServiceContext)} + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public interface PollenServiceContext { + + TopiaContext getTransaction(); + + void setTransaction(TopiaContext transaction); + + Locale getLocale(); + + PollenConfiguration getConfiguration(); + + PollenServiceFactory getServiceFactory(); + + <E extends PollenService> E newService(Class<E> clazz); + + /** + * createPollenUrlId : + * Create a unique UId for entities which need it (PollAccount, Poll). + * This UId represent the entity in UI module. + * + * @return String + */ + String createPollenUrlId(); + + /** @return the current date */ + Date getCurrentTime(); + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,58 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + +import org.chorem.pollen.PollenTechnicalException; + +import java.lang.reflect.InvocationTargetException; + +/** + * Factory of services. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class PollenServiceFactory { + + public <E extends PollenService> E newService(Class<E> clazz, PollenServiceContext serviceContext) { + // instantiate service using empty constructor + E service; + try { + service = clazz.getConstructor().newInstance(); + } catch (InstantiationException e) { + throw new PollenTechnicalException(e); + } catch (IllegalAccessException e) { + throw new PollenTechnicalException(e); + } catch (InvocationTargetException e) { + throw new PollenTechnicalException(e); + } catch (NoSuchMethodException e) { + throw new PollenTechnicalException(e); + } + + service.setServiceContext(serviceContext); + + return service; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,118 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.DateUtils; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; + +import java.util.Date; +import java.util.List; +import java.util.Locale; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class PollenServiceSupport implements PollenService { + + protected PollenServiceContext serviceContext; + + @Override + public void setServiceContext(PollenServiceContext serviceContext) { + this.serviceContext = serviceContext; + } + + public <E extends TopiaEntity> List<E> getEntities(PollenDAOHelper.PollenEntityEnum entityType) { + Class<E> contract = (Class<E>) entityType.getContract(); + return getEntities(contract); + } + + public <E extends TopiaEntity> List<E> getEntities(Class<E> entityType) { + Preconditions.checkNotNull(entityType); + try { + List<E> result = PollenDAOHelper.<E, TopiaDAO<E>>getDAO( + getTransaction(), + entityType).findAll(); + return result; + } catch (TopiaException eee) { + throw new PollenTechnicalException( + "Could not obtain data for type " + entityType, eee); + } + } + + public <E extends TopiaEntity> E getEntityById(Class<E> entityType, String id) { + Preconditions.checkNotNull(entityType); + Preconditions.checkArgument(StringUtils.isNotEmpty(id)); + try { + E result = PollenDAOHelper.<E, TopiaDAO<E>>getDAO( + getTransaction(), + entityType).findByTopiaId(id); + return result; + } catch (TopiaException eee) { + throw new PollenTechnicalException( + "Could not obtain data of id [" + id + "] for type " + + entityType, eee); + } + } + + protected TopiaContext getTransaction() { + return serviceContext.getTransaction(); + } + + protected Locale getLocale() { + return serviceContext.getLocale(); + } + + protected PollenConfiguration getConfiguration() { + return serviceContext.getConfiguration(); + } + + protected <E extends PollenService> E newService(Class<E> serviceClass) { + E service = serviceContext.newService(serviceClass); + return service; + } + + protected void commitTransaction(String errorMessage) { + try { + getTransaction().commitTransaction(); + } catch (TopiaException eee) { + throw new PollenTechnicalException(errorMessage, eee); + } + } + + protected void flushTransaction() throws TopiaException { + TopiaContextImplementor tx = (TopiaContextImplementor) getTransaction(); + tx.getHibernate().flush(); + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class FavoriteListAlreadyExistException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ParticipantAlreadyFoundInListException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ParticipantExistWithoutMailException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollAlreadyClosedException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollAlreadyExistException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollNotFoundException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class UserEmailAlreadyUsedException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class UserInvalidPasswordException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class UserLoginAlreadyUsedException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class UserNotFoundException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class VoteDoubloonException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.exceptions; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class VoteNotAllowedException extends Exception { + + private static final long serialVersionUID = 1L; + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,82 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.commons.mail.EmailException; +import org.apache.commons.mail.SimpleEmail; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.services.PollenServiceSupport; + +public class EmailService extends PollenServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(EmailService.class); + + public void sendEmail(String to, + String subject, + String content) { + try { + // Create the SimpleEmail to send + SimpleEmail email = createSimpleEmail(to, subject, content); + email.send(); + + if (log.isInfoEnabled()) { + log.info("Mail sent to : " + to); + + if (log.isDebugEnabled()) { + log.debug("Email infos : " + + "\ndate: " + email.getSentDate() + + "\nhostname: " + email.getHostName() + + "\nport: " + email.getSmtpPort() + + "\nfrom: " + email.getFromAddress().toString()); + } + } + } catch (EmailException eee) { + throw new PollenTechnicalException( + "could not send email to " + to, eee); + } + } + + protected SimpleEmail createSimpleEmail( + String to, + String subject, + String content) throws EmailException { + PollenConfiguration configuration = getConfiguration(); + + SimpleEmail result = new SimpleEmail(); + result.setHostName(configuration.getEmailHost()); + result.setSmtpPort(configuration.getEmailPort()); + result.setFrom(configuration.getEmailFrom()); + result.setCharset(configuration.getCharset()); + + result.addTo(to); + result.setSubject(subject); + result.setMsg(content); + return result; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,238 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.services.PollenServiceSupport; + +public class FavoriteService extends PollenServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FavoriteService.class); + +// public void createFavoriteParticipant(FavoriteParticipant participant) throws ParticipantExistWithoutMailException, ParticipantAlreadyFoundInListException { +// try { +// FavoriteParticipantDAO dao = +// PollenDAOHelper.getFavoriteParticipantDAO(getTransaction()); +// +// checkFavoriteParticipant(dao, participant); +// +// // Create newParticipant with naturalId +// FavoriteParticipant result = +// dao.create(participant.getName(), +// participant.getEmail(), +// participant.getFavoriteList()); +// +// // Set other field +// result.setWeight(participant.getWeight()); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void deleteFavoriteParticipant(String id) { +// try { +// FavoriteParticipantDAO dao = +// PollenDAOHelper.getFavoriteParticipantDAO(getTransaction()); +// +// FavoriteParticipant participantLoaded = dao.findByTopiaId(id); +// dao.delete(participantLoaded); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public FavoriteParticipant getFavoriteParticipant(String id) { +// try { +// FavoriteParticipantDAO dao = +// PollenDAOHelper.getFavoriteParticipantDAO(getTransaction()); +// +// FavoriteParticipant result = dao.findByTopiaId(id); +// //No more needed +//// // Load parent list +//// result.getFavoriteList(); +// +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public Map<String, FavoriteParticipant> getFavoriteParticipants(EntityFilter filter) { +// try { +// FavoriteParticipantDAO dao = +// PollenDAOHelper.getFavoriteParticipantDAO(getTransaction()); +// +// PollenQueryHelper.FavoriteParticipantProperty participantProperty = +// PollenQueryHelper.newFavoriteParticipantProperty(); +// +// TopiaQuery query = dao.createQueryFindAllByFavoriteList(filter); +// +// if (log.isDebugEnabled()) { +// log.debug("Query : " + query); +// } +// +// query.addLoad(participantProperty.favoriteList()); +// +// Map<String, FavoriteParticipant> results = +// dao.findAllMappedByQuery(query); +// +// return results; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public List<FavoriteList> getFavoriteLists(UserAccount user) { +// try { +// FavoriteListDAO dao = +// PollenDAOHelper.getFavoriteListDAO(getTransaction()); +// +// List<FavoriteList> result = dao.findAllByUserAccount(user); +// +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void deleteFavoriteList(FavoriteList list) { +// try { +// FavoriteListDAO dao = +// PollenDAOHelper.getFavoriteListDAO(getTransaction()); +// +// FavoriteList listLoaded = dao.findByTopiaId(list.getId()); +// dao.delete(listLoaded); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void createFavoriteList(FavoriteList list) throws FavoriteListAlreadyExistException { +// try { +// FavoriteListDAO dao = +// PollenDAOHelper.getFavoriteListDAO(getTransaction()); +// +// // check favoriteList name exist for user +// UserAccount user = list.getUserAccount(); +// +// // existing list found +// if (dao.existByNaturalId(list.getName(), user)) { +// throw new FavoriteListAlreadyExistException(); +// } +// +// dao.create(list.getName(), list.getUserAccount()); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public int getNbFavoriteParticipants(EntityFilter filter) { +// try { +// FavoriteParticipantDAO dao = +// PollenDAOHelper.getFavoriteParticipantDAO(getTransaction()); +// +// TopiaQuery query = dao.createQueryFindAllByFavoriteList(filter); +// +// int result = dao.countByQuery(query); +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public FavoriteParticipant getNewFavoriteParticipant(FavoriteList list) { +// FavoriteParticipant result = new FavoriteParticipantImpl(); +// result.setFavoriteList(list); +// result.setWeight(1.); +// return result; +// } +// +// public FavoriteList getNewFavoriteList(UserAccount user) { +// FavoriteList result = new FavoriteListImpl(); +// result.setUserAccount(user); +// return result; +// } +// +// public void updateFavoriteParticipant(FavoriteParticipant participant) throws ParticipantExistWithoutMailException, ParticipantAlreadyFoundInListException { +// try { +// FavoriteParticipantDAO dao = +// PollenDAOHelper.getFavoriteParticipantDAO(getTransaction()); +// +// checkFavoriteParticipant(dao, participant); +// +// FavoriteParticipant participantLoaded = +// dao.findByTopiaId(participant.getId()); +// +// // Set all fields except favoriteList that can't be changed +// participantLoaded.setName(participant.getName()); +// participantLoaded.setEmail(participant.getEmail()); +// participantLoaded.setWeight(participant.getWeight()); +// +// dao.update(participantLoaded); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// /** +// * Check if the {@code participant} doesn't already exists with same email, +// * name and favoriteList. +// * +// * @param dao used to verify the existing participant +// * @param participant FavoriteParticipant to check +// * @throws TopiaException for technical errors from ToPIA +// * @throws ParticipantAlreadyFoundInListException +// * if a participant already exist in list +// * @throws ParticipantExistWithoutMailException +// * if a participan was found without email +// */ +// protected void checkFavoriteParticipant(FavoriteParticipantDAO dao, +// FavoriteParticipant participant) +// throws TopiaException, ParticipantExistWithoutMailException, ParticipantAlreadyFoundInListException { +// +// FavoriteList list = participant.getFavoriteList(); +// +// TopiaQuery query = dao.createQuery(). +// addEquals(FavoriteParticipant.PROPERTY_FAVORITE_LIST, list). +// addEquals(FavoriteParticipant.PROPERTY_NAME, participant.getName()). +// addEquals(FavoriteParticipant.PROPERTY_EMAIL, participant.getEmail()); +// +// // Check only on entities different from the one in argument +// if (StringUtils.isNotEmpty(participant.getId())) { +// query.addWhere(TopiaEntity.TOPIA_ID, TopiaQuery.Op.NEQ, participant.getId()); +// } +// +// // existing participant found +// if (dao.existByQuery(query)) { +// // The error type (message) depends on email nullity +// if (participant.getEmail() == null) { +// throw new ParticipantExistWithoutMailException(); +// } else { +// throw new ParticipantAlreadyFoundInListException(); +// } +// } +// } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,97 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.Comment; +import org.chorem.pollen.business.persistence.CommentDAO; +import org.chorem.pollen.business.persistence.CommentImpl; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollDAO; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.services.PollenServiceSupport; +import org.nuiton.topia.TopiaException; + +/** + * Manage comments on a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollCommentService extends PollenServiceSupport { + + public int getNbComments(Poll poll) { + try { + PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); + + Poll pollFound = dao.findByTopiaId(poll.getTopiaId()); + + int result = pollFound.sizeComment(); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public Comment createComment(Poll poll, Comment comment) { + try { + CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); + + Comment commentCreated = dao.create( + Comment.PROPERTY_POLL, poll, + Comment.PROPERTY_POST_DATE, serviceContext.getCurrentTime(), + Comment.PROPERTY_TEXT, comment.getText() + ); + + PollDAO pollDAO = PollenDAOHelper.getPollDAO(getTransaction()); + + Poll pollToUpdate = pollDAO.findByTopiaId(poll.getTopiaId()); + + pollToUpdate.addComment(commentCreated); + + pollDAO.update(pollToUpdate); + return commentCreated; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void deleteComment(Comment comment) { + try { + CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); + dao.delete(comment); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public Comment getNewComment(PollAccount account) { + Comment result = new CommentImpl(); + if (account != null) { + result.setPollAccount(account); + } + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,642 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollAccountImpl; +import org.chorem.pollen.business.persistence.PollImpl; +import org.chorem.pollen.business.persistence.PollType; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.business.persistence.VoteCounting; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.services.PollenServiceSupport; +import org.nuiton.topia.TopiaException; + +public class PollService extends PollenServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(PollService.class); + + /** + * Build a new Poll instance with given {@code user} as administrator + * + * @param user Build a new Poll instance with given {@code user} as administrator + * @return Build a new Poll instance with given {@code user} as administrator + */ + public Poll getNewPoll(UserAccount user) { + Poll result = new PollImpl(); + + try { + ChoiceType choiceType = PollenDAOHelper.getChoiceTypeDAO(getTransaction()).findByName("TEXT"); + result.setChoiceType(choiceType); + + VoteCounting voteCounting = PollenDAOHelper.getVoteCountingDAO(getTransaction()).findByName("NORMAL"); + result.setVoteCounting(voteCounting); + + PollType pollType = PollenDAOHelper.getPollTypeDAO(getTransaction()).findByName("FREE"); + result.setPollType(pollType); + + // Initialize creator as an admin for the poll + PollAccount creator = new PollAccountImpl(); +// creator.setAdmin(true); + if (user != null) { + // Link the creator with the user +// creator.setName(user.getDisplayName()); + creator.setEmail(user.getEmail()); + creator.setUserAccount(user); + } + result.setCreator(creator); + // Generate Uid to have a unique poll. Will avoid multi-submit, existing + // poll will be check by its uid. + result.setPollId(serviceContext.createPollenUrlId()); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } +// +// /** +// * Build a new Poll instance based on existing {@code poll} (copy) +// * +// * @param poll Build a new Poll instance based on existing {@code poll} (copy) +// * @return Build a new Poll instance based on existing {@code poll} (copy) +// */ +// public Poll getNewPoll(Poll poll) { +// Poll result = new PollImpl(); +// TopiaEntityBinder<Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); +// //TODO-fdesbois-2010-07-13 : add test and check if exluding only those properties is realistic +// binder.copyExcluding(poll, result, +// Poll.PROPERTY_POLL_ID, +// Poll.PROPERTY_CLOSED, +// Poll.PROPERTY_RESULT, +// Poll.PROPERTY_POLL_ACCOUNT +// ); +// // Copy of participants only for no free poll +// if (poll.getType().isRestrictedOrGroup()) { +// result.setPollAccount(poll.getPollAccount()); +// } +// return result; +// } +// +// public Poll createPoll(Poll poll, +// Collection<ParticipantList> lists) throws PollAlreadyExistException { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// if (dao.existByNaturalId(poll.getUid())) { +// throw new PollAlreadyExistException(); +// } +// +// // Create newPoll and copy simple properties from poll source +// Poll newPoll = createBasicPoll(poll); +// +// // Create accounts only for non free poll +// if (!newPoll.getType().isFree()) { +// // Create accounts depends on pollType and lists argument +// List<PollAccount> accounts = +// createPollAccounts(newPoll.getType(), lists); +// newPoll.setPollAccount(accounts); +// } +// +// // Create newPoll choices +// List<Choice> choices = createPollChoices(poll.getChoice()); +// +// newPoll.setChoice(choices); +// +// dao.update(newPoll); +// +// return newPoll; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public Poll updatePoll(Poll poll) throws PollAlreadyClosedException { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// // Updating a Poll : +// // - TITLE +// // - DESCRIPTION +// // - BEGIN/END DATE +// // - CHOICE_ADD_ALLOWED +// // - BEGIN/END ADD CHOICE DATE +// // - MAX_CHOICE_NB +// // - CONTINUOUS_RESULTS +// // - PUBLIC_RESULTS +// // - ANONYMOUS_VOTE_ALLOWED +// +// // Anonymous change is not supported (need to manage accounts) +// // PollType change is not supported (need to manage accounts) +// // VoteCounting change is not supported (need to manage existing votes) +// +// // Comments, Results, Choices and Accounts will not be updated here +// +// // Update only for not started poll : +// // - VOTE_COUNTING +// // - CHOICE_TYPE +// // - CHOICES +// +// Poll pollToUpdate = dao.findByTopiaId(poll.getTopiaId()); +// +// // Can't update a closed poll +// if (pollToUpdate.isClosed()) { +// throw new PollAlreadyClosedException(); +// } +// +// TopiaEntityBinder<Poll> binder = +// PollenBinderHelper.getSimpleTopiaBinder(Poll.class); +// +// // Idea, if we can use Embeddable object for Hibernate, Options will be a good use case +// binder.copy(poll, pollToUpdate, +// Poll.PROPERTY_TITLE, +// Poll.PROPERTY_DESCRIPTION, +// Poll.PROPERTY_BEGIN_DATE, +// Poll.PROPERTY_END_DATE, +// Poll.PROPERTY_ANONYMOUS_VOTE_ALLOWED, +// Poll.PROPERTY_CHOICE_ADD_ALLOWED, +// Poll.PROPERTY_BEGIN_CHOICE_DATE, +// Poll.PROPERTY_END_CHOICE_DATE, +// Poll.PROPERTY_CONTINUOUS_RESULTS, +// Poll.PROPERTY_PUBLIC_RESULTS, +// Poll.PROPERTY_MAX_CHOICE_NB +// ); +// +// // if not started +// if (!pollToUpdate.isStarted()) { +// +// log.debug("Poll is not started, update voteCounting and choices"); +// +// // Update voteCounting is simple when poll have no vote +// pollToUpdate.setVoteCounting(poll.getVoteCounting()); +// +// // Override choices if type has changed, otherwise the choice entity will automatically be updated +// if (!pollToUpdate.getChoiceType().equals(poll.getChoiceType())) { +// pollToUpdate.setChoiceType(poll.getChoiceType()); +// +// ChoiceDAO choiceDAO = PollenDAOHelper.getChoiceDAO(getTransaction()); +// // Clear previous choices, will properly delete orphans +// pollToUpdate.getChoice().clear(); +// // Create new choices and add them to the poll +// for (Choice choice : poll.getChoice()) { +// Choice newChoice = pollToUpdate.addNewChoice(choice.getName(), choice.getDescription()); +// choiceDAO.create(newChoice); +// } +// } +// } +// +// // If continuous results is now activated, execute a voteCounting +// if (!pollToUpdate.isContinuousResults() && +// poll.isContinuousResults()) { +// // TODO-fdesbois-2011-07-13 : execute vote counting +// } +// +// Poll result = dao.update(pollToUpdate); +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void deletePoll(Poll poll) { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// dao.delete(poll); +// //FIXME tchemit-20120124 Remove any other sotrages relatives to this poll (images choices for example). +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void deleteChoice(Choice choice) { +// try { +// ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); +// dao.delete(choice); +// //FIXME tchemit-20120124 Remove any other sotrages relatives to this poll (images choices for example). +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// //FIXME tchemit-20120123 Replace the filter by a simple PagerBean +// public List<UserPoll> getPolls(EntityFilter filter) { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// PollenQueryHelper.PollAccountProperty participantProperty = +// PollenQueryHelper.newPollAccountChildProperty(); +// +// // Filter can be apply on userAccount as reference +// TopiaQuery query = dao.createQueryFindAllByUser(filter); +// +// query.addSelect(participantProperty.$alias()); +// +// log.debug("Query : " + query); +// +// List<UserPoll> results = retrieveUserPolls(query); +// +// return results; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// //FIXME tchemit-20120123 Replace the filter by a simple PagerBean +// public List<Comment> getComments(EntityFilter filter) { +// try { +// CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); +// +//// String pollAlias = PollenQueryHelper.ALIAS_POLL; +//// String pollCommentProperty = +//// TopiaQuery.getProperty(pollAlias, Poll.PROPERTY_COMMENT); +//// String commentAlias = PollenQueryHelper.ALIAS_COMMENT; +// +// PollenQueryHelper.PollProperty pollProperty = +// PollenQueryHelper.newPollProperty(); +// PollenQueryHelper.CommentProperty commentProperty = +// PollenQueryHelper.newCommentProperty(); +// +// filter.checkReference(Poll.class, true); +// filter.setReferenceProperty(pollProperty.$alias()); +// +// TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). +// setSelect(commentProperty.$alias()). +// addJoin(pollProperty.comment(), commentProperty.$alias(), false). +// addFilter(filter); +// +// List<Comment> comments = dao.findAllByQuery(query); +// return comments; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public ParticipantList getNewPollList() { +// PollAccount result = new PollAccountImpl(); +// result.setList(true); +// result.setChild(new ArrayList<PollAccount>()); +// return result; +// } +// +// public Participant getNewPollParticipant() { +// PollAccount result = new PollAccountImpl(); +// result.setWeight(1.); +// return result; +// } +// +// //FIXME tchemit-20120123 Remove the fetch system we don't need it with our transaction management +// public Poll getPoll(String pollUid, String... properties) throws PollNotFoundException { +// try { +// // Property is used to control the alias and dependencies inside the query +// PollenQueryHelper.PollProperty pollProperty = +// PollenQueryHelper.newPollProperty(); +// +// // Need to control the alias for fetching, add it to each property +// String[] fetchProperties = new String[properties.length]; +// for (int i = 0; i < properties.length; i++) { +// // This will clean properties for fetching +// fetchProperties[i] = pollProperty.$property(properties[i]); +// } +// +// // Create the query using default alias for Poll +// TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). +// addFetch(fetchProperties). +// addEquals(pollProperty.uid(), pollUid); +// +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// Poll result = dao.findByQuery(query); +// if (result == null) { +// throw new PollNotFoundException(); +// } +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// //FIXME tchemit-20120123 Should check userAccount and pollUid exist ? +// public boolean canAdminPoll(String accountUid, String pollUid) { +// try { +// PollenQueryHelper.PollProperty pollProperty = +// PollenQueryHelper.newPollProperty(); +// +// TopiaQuery query = PollenQueryHelper.createQuery(pollProperty). +// addEquals(pollProperty.uid(), pollUid). +// addEquals(pollProperty.creatorProperty().uid(), accountUid); +// +// +// // Note a boolean admin exist in PollAccount, maybe +// // find the account in lists +// +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// boolean result = dao.existByQuery(query); +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public int getNbTotalPolls() { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// Long result = dao.count(); +// return result.intValue(); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// //FIXME tchemit-20120123 Remove this from dao, remove EntityFilter... +// public int getNbPollsByUser(UserAccount user) { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// EntityFilter filter = new TopiaFilter(); +// filter.setReference(user); +// TopiaQuery query = dao.createQueryFindAllByUser(filter); +// +// int result = dao.countByQuery(query); +// +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public List<Poll> getRunningPolls() { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// // isRunning : isStarted() && !isFinished() && !isClosed() +// +// Date now = serviceContext.getCurrentTime(); +// +// TopiaQuery query = dao.createQuery(). +// addWhere(Poll.PROPERTY_BEGIN_DATE, TopiaQuery.Op.LE, now). +// addWhere(Poll.PROPERTY_END_DATE, TopiaQuery.Op.GE, now). +// addEquals(Poll.PROPERTY_CLOSED, Boolean.FALSE). +// addOrderDesc(Poll.TOPIA_CREATE_DATE); +// +// List<Poll> result = dao.findAllByQuery(query); +// +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public Choice createChoice(Poll poll, Choice choice) { +// try { +// ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); +// +// Choice choiceCreated = dao.create( +// Choice.PROPERTY_NAME, choice.getName(), +// Choice.PROPERTY_DESCRIPTION, choice.getDescription(), +// Choice.PROPERTY_TYPE, choice.getType() +// ); +// +// PollDAO pollDAO = PollenDAOHelper.getPollDAO(getTransaction()); +// +// Poll pollToUpdate = pollDAO.findByTopiaId(poll.getTopiaId()); +// +// pollToUpdate.addChoice(choiceCreated); +// +// pollDAO.update(pollToUpdate); +// +// return choiceCreated; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public Choice getNewChoice(Poll poll) { +// Choice result = new ChoiceImpl(); +// result.setType(poll.getChoiceType()); +// return result; +// } +// +// public void setPollClosed(Poll poll, boolean closed) throws Exception { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// Poll pollToUpdate = dao.findByTopiaId(poll.getTopiaId()); +// pollToUpdate.setClosed(closed); +// +// dao.update(pollToUpdate); +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public Poll createBasicPoll(Poll source) +// throws TopiaException { +// try { +// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); +// +// PollAccountDAO accountDAO = +// PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// // Create newPoll and copy simple properties from poll source +// Poll result = dao.create(source.getUid()); +// +// // Copy all properties instead of Uid (already set at creation), +// // Closed (not used in this case) and Creator (managed separately) +// PollenBinderHelper.getSimpleTopiaBinder(Poll.class). +// copyExcluding(source, result, +// Poll.PROPERTY_UID, +// Poll.PROPERTY_CLOSED, +// Poll.PROPERTY_CREATOR); +// +// // Create creator and set him to the poll +// PollAccount creator = accountDAO.create( +// serviceContext.createPollenUrlId()); +// +// PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class). +// copy(source.getCreator(), creator, +// PollAccount.PROPERTY_NAME, +// PollAccount.PROPERTY_EMAIL, +//// PollAccount.WEIGHT, +// PollAccount.PROPERTY_ADMIN, +// PollAccount.PROPERTY_USER_ACCOUNT); +// accountDAO.update(creator); +// +// result.setCreator(creator); +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void validatePoll(Poll poll) { +// +// Date currentTime = serviceContext.getCurrentTime(); +// +// if (poll.getBeginDate() == null) { +// poll.setBeginDate(currentTime); +// } +// +// if (poll.getEndDate() != null) { +// Preconditions.checkArgument(poll.getEndDate().before(poll.getBeginDate())); +// } +// +// // Add choices if allowed after creation +// if (poll.isChoiceAddAllowed()) { +// +// // Initialize beginChoiceDate if needed +// if (poll.getBeginChoiceDate() == null) { +// poll.setBeginChoiceDate(currentTime); +// } +// +// // Check beginChoiceDate +// if (poll.getEndDate() != null) { +// Preconditions.checkArgument(poll.getBeginChoiceDate().before(poll.getEndDate())); +// } +// +// // Check endChoiceDate +// if (poll.getEndChoiceDate() != null) { +// Preconditions.checkArgument(poll.getEndChoiceDate().after(poll.getBeginChoiceDate())); +// } +// } +// } +// +// protected List<PollAccount> createPollAccounts(PollType type, +// Collection<ParticipantList> lists) +// throws TopiaException, IllegalArgumentException { +// +// List<PollAccount> results = new ArrayList<PollAccount>(); +// +// PollAccountDAO accountDAO = +// PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// switch (type) { +// case RESTRICTED: +// if (CollectionUtils.isEmpty(lists)) { +// throw new IllegalArgumentException("lists can't be empty" + +// " for restricted poll"); +// } +// // Create accounts only on first participant list +// results = createPersonAccounts(accountDAO, +// lists.iterator().next()); +// break; +// case GROUP: +// if (CollectionUtils.isEmpty(lists)) { +// throw new IllegalArgumentException("lists can't be empty" + +// " for group poll"); +// } +// +// for (ParticipantList list : lists) { +// // Create the accountList +// PollAccount accountList = accountDAO.create( +// serviceContext.createPollenUrlId()); +// accountList.setList(true); +// accountList.setName(list.getName()); +// +// // Create account children +// List<PollAccount> accounts = +// createPersonAccounts(accountDAO, list); +// accountList.setChild(accounts); +// +// // Add the accountList to the results +// results.add(accountList); +// } +// } +// return results; +// } +// +// protected List<PollAccount> createPersonAccounts(PollAccountDAO dao, +// ParticipantList list) +// throws TopiaException { +// +// List<PollAccount> results = new ArrayList<PollAccount>(); +// +// for (Participant participant : list.getParticipants()) { +// String accountUid = serviceContext.createPollenUrlId(); +// PollAccount account = dao.create(accountUid); +// account.setName(participant.getName()); +// account.setEmail(participant.getEmail()); +// account.setWeight(participant.getWeight()); +// dao.update(account); +// results.add(account); +// } +// return results; +// } +// +// protected List<Choice> createPollChoices(List<Choice> source) +// throws TopiaException { +// +// ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); +// +// List<Choice> results = new ArrayList<Choice>(); +// +// for (Choice choice : source) { +// Choice newChoice = dao.create(); +// PollenBinderHelper.getSimpleTopiaBinder(Choice.class). +// copy(choice, newChoice); +// results.add(newChoice); +// } +// return results; +// } +// +// //FIXME tchemit-20120123 : help me to destroy this :( +// protected List<UserPoll> retrieveUserPolls(TopiaQuery query) +// throws TopiaException { +// +// List<UserPoll> results = new ArrayList<UserPoll>(); +// +// Map<String, UserPoll> pollsCache = +// new HashMap<String, UserPoll>(); +// +// +// List<Object[]> queryResults = getTransaction().findByQuery(query); +// for (Object[] row : queryResults) { +// Poll poll = (Poll) row[0]; +// PollAccount account = (PollAccount) row[1]; +// if (log.isDebugEnabled()) { +// log.debug("account : " + account.getUid() + " : " + +// account.getName() + +// " list(" + account.isList() + ")" + +// " admin(" + account.isAdmin() + ")" + +// " for poll " + poll.getTitle()); +// } +// +// UserPoll userPoll = pollsCache.get(poll.getTopiaId()); +// +// if (userPoll == null) { +// userPoll = new UserPoll(); +// userPoll.setPoll(poll); +// results.add(userPoll); +// pollsCache.put(poll.getTopiaId(), userPoll); +// } +// +// userPoll.addAccount(account); +// } +// +// return results; +// } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,277 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.business.persistence.UserAccountDAO; +import org.chorem.pollen.business.persistence.UserAccountImpl; +import org.chorem.pollen.entities.PollenBinderHelper; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; +import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserNotFoundException; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaQuery; +import org.nuiton.topia.persistence.util.TopiaEntityBinder; +import org.nuiton.util.PagerUtil; +import org.nuiton.util.StringUtil; +import org.nuiton.util.beans.Binder; + +import java.net.URL; +import java.util.List; +import java.util.Locale; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.l_; + +public class UserService extends PollenServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(UserService.class); + + public UserAccount connect(String login, String password) throws UserNotFoundException, UserInvalidPasswordException { + try { + UserAccountDAO dao = + PollenDAOHelper.getUserAccountDAO(getTransaction()); + + UserAccount user = dao.findByLogin(login); + + if (user == null) { + throw new UserNotFoundException(); + } + + String encodedPassword = encodePassword(password); + if (!encodedPassword.equals(user.getPassword())) { + throw new UserInvalidPasswordException(); + } + + return user; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public UserAccount createUser(UserAccount user, + boolean byAdmin, + URL url) throws UserLoginAlreadyUsedException, UserEmailAlreadyUsedException { + + String password = user.getPassword(); // le mot de passe en clair + + UserAccount userAccount; + try { + UserAccountDAO dao = + PollenDAOHelper.getUserAccountDAO(getTransaction()); + + UserAccount userByLogin = dao.findByLogin(user.getLogin()); + if (userByLogin != null) { + throw new UserLoginAlreadyUsedException(); + } + UserAccount userByEmail = dao.findByEmail(user.getEmail()); + if (userByEmail != null) { + throw new UserEmailAlreadyUsedException(); + } + if (byAdmin) { + + // let's generate the new password + password = RandomStringUtils.randomAlphanumeric(8); + } + + String encodedPassword = encodePassword(password); + userAccount = dao.create( + UserAccount.PROPERTY_LOGIN, user.getLogin(), + UserAccount.PROPERTY_PASSWORD, encodedPassword + ); + user.setTopiaId(userAccount.getTopiaId()); + copyUserAccount(user, userAccount); + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + + if (url != null && StringUtil.isEmail(user.getEmail())) { + + Locale locale = getLocale(); + String subject = l_(locale, "pollen.email.userRegister.subject", + user.getLogin()); + String content = l_(locale, "pollen.email.userRegister.content", + user.getDisplayName(), + user.getLogin(), password, url); + + EmailService emailService = newService(EmailService.class); + + emailService.sendEmail( + user.getEmail(), + subject, + content); + } + + return userAccount; + } + + public UserAccount updateUser(UserAccount user, + String newPassword, + boolean byAdmin) throws UserEmailAlreadyUsedException, UserInvalidPasswordException { + + try { + + UserAccountDAO dao = + PollenDAOHelper.getUserAccountDAO(getTransaction()); + + UserAccount userToUpdate = dao.findByTopiaId(user.getTopiaId()); + + // Do not manage password for an admin update + if (!byAdmin) { + + // Check original password + String encodedPassword = encodePassword(user.getPassword()); + if (!encodedPassword.equals(userToUpdate.getPassword())) { + throw new UserInvalidPasswordException(); + } + + if (StringUtils.isNotEmpty(newPassword)) { + + // encode new password and store it in user account + String newEncodedPassword = encodePassword(newPassword); + userToUpdate.setPassword(newEncodedPassword); + } + } + + // In case of email change, check if an other user has not already + // the new email + // FIXME-fdesbois-20100510 : replace by using id directly + TopiaQuery query = dao.createQuery(). + addWhere(UserAccount.PROPERTY_LOGIN, + TopiaQuery.Op.NEQ, user.getLogin()); + query.addEquals(UserAccount.PROPERTY_EMAIL, + StringUtils.lowerCase(user.getEmail())); + + // existing user found + if (dao.existByQuery(query)) { + throw new UserEmailAlreadyUsedException(); + } + + copyUserAccount(user, userToUpdate); + return userToUpdate; + + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public UserAccount getNewUser() { + UserAccount result = new UserAccountImpl(); + return result; + } + + public void deleteUser(String login) { + try { + UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); + UserAccount user = dao.findByLogin(login); + dao.delete(user); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public List<UserAccount> getUsers(PagerUtil.PagerBean pager) { + + try { + UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); + + long records = dao.count(); + pager.setRecords((int) records); + + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + TopiaQuery query = dao.createQuery("e"); + query.setLimit(pager.getRecordStartIndex(), pager.getRecordEndIndex() - 1); + List<UserAccount> result = dao.findAllByQuery(query); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public int getNbUsers() { + try { + UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction()); + Long result = dao.count(); + return result.intValue(); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void createDefaultUsers() { + UserAccount user = getNewUser(); + user.setAdministrator(true); + String login = getConfiguration().getAdminLogin(); + user.setLogin(login); + user.setEmail(getConfiguration().getAdminEmail()); + user.setPassword(getConfiguration().getAdminPassword()); + try { + createUser(user, false, null); + if (log.isInfoEnabled()) { + log.info(_("pollen.info.admin.created", login)); + } + } catch (Exception eee) { + if (log.isInfoEnabled()) { + log.info(_("pollen.info.admin.exists") + " : " + + _(eee.getMessage())); + } + } + } + + protected String encodePassword(String password) { + return StringUtil.encodeMD5(password); + } + + /** + * Copy {@code source} user account to {@code destination} one. + * The email is lower cased in the {@code destination} user account. + * + * @param source user account to copy + * @param destination which receive the copy + * @see Binder#copy(Object, Object, String...) + */ + protected void copyUserAccount(UserAccount source, UserAccount destination) { + TopiaEntityBinder<UserAccount> binder = + PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); + + + binder.copy(source, destination, + UserAccount.PROPERTY_ADMINISTRATOR, + UserAccount.PROPERTY_FIRST_NAME, + UserAccount.PROPERTY_LAST_NAME); + + // Don't keep case for email + destination.setEmail(StringUtils.lowerCase(source.getEmail())); + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,399 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.services.PollenServiceSupport; + +public class VoteService extends PollenServiceSupport { + + /** Logger. */ + private static final Log log = LogFactory.getLog(VoteService.class); + +// public boolean canVote(Poll poll, PollAccount participant) { +// try { +// if (log.isDebugEnabled()) { +// log.debug("Poll started : " + poll.isStarted()); +// log.debug("Poll finished : " + poll.isFinished()); +// log.debug("Poll closed : " + poll.isClosed()); +// } +// boolean result = true; +// if (!poll.isRunning()) { +// if (log.isInfoEnabled()) { +// log.info("Poll is no longer running... Participant can't vote"); +// } +// result = false; +// // Creator can't vote +// } else if (poll.getCreator().equals(participant)) { +// return false; +// } else if (poll.getType().isRestrictedOrGroup()) { +// if (log.isInfoEnabled()) { +// log.info("Poll is restricted... Participant need to be identified"); +// } +// +// PollAccountDAO dao = +// PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// TopiaQuery query = dao.createQueryFindAllParticipantsByPoll(poll); +// +// String participantAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT_CHILD; +// +// String pollCreatorProperty = +// TopiaQuery.getProperty(PollenQueryHelper.ALIAS_POLL, +// Poll.PROPERTY_CREATOR); +// +// query.addEquals(participantAlias, participant). +// addWhere(pollCreatorProperty, TopiaQuery.Op.NEQ, participant); +// +// if (log.isDebugEnabled()) { +// log.debug("Query : " + query); +// } +// +// result = dao.existByQuery(query); +// } +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public PollAccount getNewPollAccount(UserAccount user) { +// PollAccount result = new PollAccountImpl(); +// if (user != null) { +// result.setName(user.getDisplayName()); +// result.setEmail(user.getEmail()); +// result.setUserAccount(user); +// } +// return result; +// } +// +// public PollAccount getPollAccount(String accountUid) { +// try { +// PollenQueryHelper.PollAccountProperty accountProperty = +// PollenQueryHelper.newPollAccountProperty(); +// +// TopiaQuery query = PollenQueryHelper.createQuery(accountProperty). +// addEquals(accountProperty.uid(), accountUid). +// // Need fetching account votes to edit them +// addFetch(accountProperty.choiceVote()); +// +// PollAccount result = +// PollenDAOHelper.getPollAccountDAO(getTransaction()). +// findByQuery(query); +// +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public List<PollAccount> getVotes(EntityFilter filter) { +// try { +// PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +//// String participantChoiceProperty = +//// TopiaQuery.getProperty(PollenQueryHelper.ALIAS_POLL_ACCOUNT, +//// PollAccount.PROPERTY_CHOICE_VOTE, +//// Vote.PROPERTY_CHOICE); +//// +//// TopiaQuery query = dao.createQueryFindAllByPoll(filter). +//// addDistinct(). +//// addFetch(participantChoiceProperty); +// +// PollenQueryHelper.PollAccountProperty accountProperty = +// PollenQueryHelper.newPollAccountProperty(); +// +// TopiaQuery query = dao.createQueryFindAllByPoll(filter). +// addDistinct(). +// addFetch(accountProperty.choiceVoteProperty().choice()); +// +// List<PollAccount> results = dao.findAllByQuery(query); +// +// if (log.isDebugEnabled()) { +// log.debug("Query : " + query); +// } +// +// return results; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public void deleteVote(Poll poll, PollAccount participant) { +// try { +// // For free poll, delete the participant +// // For other types, delete all votes and set voteDate to null +// +// PollAccountDAO dao = +// PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// if (poll.getType().isFree()) { +// +// PollAccount participantToDelete = +// dao.findByTopiaId(participant.getTopiaId()); +// +// dao.delete(participantToDelete); +// +// } else if (poll.getType().isRestrictedOrGroup()) { +// +// PollAccount participantToUpdate = +// dao.findByTopiaId(participant.getTopiaId()); +// +// // Remove all votes deleted by cascade +// participantToUpdate.clearChoiceVote(); +// // Reset date, the participant is considered like he has not alerady +// // voted +// participantToUpdate.setVoteDate(null); +// +// dao.update(participantToUpdate); +// } +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public int getNbVotes(Poll poll) { +// try { +// PollAccountDAO dao = +// PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// EntityFilter filter = new TopiaFilter(); +// filter.setReference(poll); +// TopiaQuery query = dao.createQueryFindAllByPoll(filter); +// +// int result = dao.countByQuery(query); +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// public Vote getNewVote(Choice choice) { +// Vote result = new VoteImpl(); +// result.setChoice(choice); +// return result; +// } +// +// public PollAccount saveVote(Poll poll, PollAccount participant) throws VoteNotAllowedException, VoteDoubloonException { +// try { +// // 1- executeCanVote(transaction, poll, participant); +// // 2- generate uid if needed +// // 3- update or create participant +// // 4- add participant in the poll if needed +// // 5- save only votes with voteValue != 0 : update/create/delete +// // 6- execute calcul for continuousResults poll +// +// // NEED test : +// // need existing poll with choices +// // getNewPollAccount +// // set some votes for poll choices +// // saveVote +// +// PollAccount result; +// if (canVote(poll, participant)) { +// +// PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// checkParticipantDoubloons(dao, poll, participant); +// +// PollAccount participantToSave = +// dao.findByTopiaId(participant.getTopiaId()); +// +// // canVote method check the existence of participant for a +// // restricted poll, so the create case is only for FREE poll. +// if (participantToSave == null) { +// if (log.isInfoEnabled()) { +// log.info("Create new participant for FREE poll"); +// } +// participantToSave = createNewParticipant(poll); +// } +// +// // Copy data (care about anonymous case) +// copyPollAccount(participant, participantToSave); +// +// // Update vote date +// participantToSave.setVoteDate(serviceContext.getCurrentTime()); +// +// if (log.isDebugEnabled()) { +// log.debug("Vote " + participantToSave.getName() + +// " updated : " + participantToSave.getVoteDate()); +// } +// +// // Save votes +// saveParticipantVotes(participant, participantToSave); +// +// dao.update(participantToSave); +// +// result = participantToSave; +// +// // TODO-fdesbois-2010-05-27 : execute vote counting if poll.isContinuousResults() +// +// } else { +// throw new VoteNotAllowedException(); +// } +// +// return result; +// } catch (TopiaException e) { +// throw new PollenTechnicalException(e); +// } +// } +// +// //FIXME tchemit-20120123 : what is the need ? :( +// public PollAccount findPollAccount(Poll poll, UserAccount user) { +// throw new UnsupportedOperationException("unsupported operation findPollAccount"); +// } +// +// protected void checkParticipantDoubloons(PollAccountDAO dao, +// Poll poll, +// PollAccount participant) +// throws TopiaException, VoteDoubloonException { +// +// TopiaQuery query = dao.createQueryFindAllParticipantsByPoll(poll); +// +// String participantAlias = PollenQueryHelper.ALIAS_POLL_ACCOUNT_CHILD; +// +// String participantNameProperty = +// TopiaQuery.getProperty(participantAlias, +// PollAccount.PROPERTY_NAME); +// +// query.addEquals(participantNameProperty, participant.getName()); +// +// if (StringUtils.isNotEmpty(participant.getTopiaId())) { +// query.addWhere(participantAlias, TopiaQuery.Op.NEQ, participant); +// } +// +// if (dao.existByQuery(query)) { +// throw new VoteDoubloonException(); +// } +// } +// +// /** +// * Create a new participant for a running {@code poll}. The participant uid +// * will be generated and the new instance of pollAccount will be added to +// * the {@code poll}. +// * +// * @param poll Poll where the new participant will be added +// * @return a new PollAccount added to the poll +// * @throws TopiaException for Topia errors +// */ +// protected PollAccount createNewParticipant(Poll poll) +// throws TopiaException { +// +// PollAccountDAO dao = +// PollenDAOHelper.getPollAccountDAO(getTransaction()); +// +// // Generate new uid +// String newUid = serviceContext.createPollenUrlId(); +// PollAccount newParticipant = dao.create(newUid); +// +// // Add the new participant in poll +// PollDAO pollDAO = PollenDAOHelper.getPollDAO(getTransaction()); +// +// Poll pollFound = pollDAO.findByTopiaId(poll.getTopiaId()); +// pollFound.addPollAccount(newParticipant); +// +// pollDAO.update(pollFound); +// return newParticipant; +// } +// +// /** +// * Save all votes from a participant. Votes will be added/updated or deleted +// * depends on voteValue and existence in database. +// * +// * @param source PollAccount source that contains vote to save +// * @param destination PollAccount destination where votes will be added to +// * be persisted +// * @throws TopiaException for Topia errors +// */ +// protected void saveParticipantVotes(PollAccount source, +// PollAccount destination) +// throws TopiaException { +// +// VoteDAO voteDAO = PollenDAOHelper.getVoteDAO(getTransaction()); +// for (Vote vote : source.getChoiceVote()) { +// +// Vote voteToSave = voteDAO.findByTopiaId(vote.getTopiaId()); +// +// if (vote.getVoteValue() != 0) { +// // Create vote +// if (voteToSave == null) { +// if (log.isDebugEnabled()) { +// log.debug("Create vote for " + destination.getUid()); +// } +// voteToSave = voteDAO.create(); +// voteToSave.setChoice(vote.getChoice()); +// // Add new vote to destination participant +// destination.addChoiceVote(voteToSave); +// } +// +// // Update vote +// voteToSave.setVoteValue(vote.getVoteValue()); +// voteDAO.update(voteToSave); +// +// // Delete vote if exist and new value is 0 +// } else if (voteToSave != null) { +// if (log.isDebugEnabled()) { +// log.debug("Delete vote for " + destination.getUid()); +// } +// // Normally the vote will be deleted +// destination.removeChoiceVote(voteToSave); +// } +// } +// } +// +// /** +// * Copy from account {@code source} to {@code destination}. The {@code +// * destination} will be persisted. The anonymous case is manage, properties +// * that identify the person are excluded from the copy in this case. +// * +// * @param source PollAccount to save +// * @param destination PollAccount with up to date data to persist +// * @see TopiaEntityBinder#copyExcluding(Object, Object, String...) +// */ +// protected void copyPollAccount(PollAccount source, PollAccount destination) { +// // Uid is the naturalId, don't copy it +// String[] excludes = new String[]{PollAccount.PROPERTY_UID}; +// +// // Exclude properties for anonymous account +// if (source.isAnonymous()) { +// if (log.isInfoEnabled()) { +// log.info("Anonymous vote, doesn't copy participant's data : " + +// "name, email, userAccount"); +// } +// +// excludes = new String[]{ +// PollAccount.PROPERTY_UID, +// PollAccount.PROPERTY_NAME, +// PollAccount.PROPERTY_EMAIL, +// PollAccount.PROPERTY_USER_ACCOUNT}; +// } +// +// TopiaEntityBinder<PollAccount> binder = +// PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class); +// +// binder.copyExcluding(source, destination, excludes); +// } + +} //ServiceVote Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,178 @@ +add=Add +addChoice-choiceDate-regexp=\\d{2}/\\d{2}/\\d{4}( \\d{2}\\\:\\d{2})? +addChoice-choiceDate-regexp-message=Date does not match pattern 12/31/2000 12\:59 AM. +addChoice-choiceDate-required-message=You must provide a choice. +addChoice-choiceImage-regexp=\\.(jpe?g|gif|png|JPE?G|GIF|PNG)$ +addChoice-choiceImage-regexp-message=The image must be a JPG, GIF or PNG file. +addChoice-choiceImage-required-message=You must provide a choice. +addChoice-choiceText-required-message=You must provide a choice. +cancel=Cancel +choiceDate-label=Date and time +choiceDescription-label=Description +choiceImage-label=Image +choiceText-label=Choice +create=Create +creatorEmail_msg=You had just created the new poll\: "%s".\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s +creatorEmail_subject=[Pollen] Poll creation (%s) +delete=Delete +edit=Edit +email-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ +email-regexp-message=Invalid email +help=Help +load=Load +login-required-message=You must provide a username +ok=Ok +pollFeed_choiceContent=%s +pollFeed_choiceTitle=New choice \: %s +pollFeed_commentContent=%s +pollFeed_commentTitle=New comment from %s +pollFeed_createContent= +pollFeed_createTitle=Poll created by %s +pollFeed_desc=%s +pollFeed_title=Pollen \: %s +pollFeed_voteContent=Poll state \: %s +pollFeed_voteTitle=New vote from %s +pollen.email.userRegister.content=Welcome %1$s. You had just created an account on the web application Pollen.\n\nLogin\: %2$s\nPassword\: %3$s\n\nYou can now manage your polls by logging on the website \: \n%4$s +pollen.email.userRegister.subject=[Pollen] Confirmation of account creation %s +pollen.error.context.close= +pollen.error.context.getRootContext= +pollen.error.context.parse= +pollen.error.context.rollback= +pollen.error.context.start= +pollen.error.context.stop= +pollen.error.encodePassword= +pollen.error.serviceEmail.createEmail= +pollen.error.serviceEmail.getNewEmail= +pollen.error.serviceEmail.sendEmail= +pollen.error.serviceFavorite.createFavoriteList= +pollen.error.serviceFavorite.createFavoriteParticipant= +pollen.error.serviceFavorite.deleteFavoriteList= +pollen.error.serviceFavorite.deleteFavoriteParticipant= +pollen.error.serviceFavorite.getFavoriteLists= +pollen.error.serviceFavorite.getFavoriteParticipant= +pollen.error.serviceFavorite.getFavoriteParticipants= +pollen.error.serviceFavorite.getNbFavoriteParticipants= +pollen.error.serviceFavorite.getNewFavoriteList= +pollen.error.serviceFavorite.getNewFavoriteParticipant= +pollen.error.serviceFavorite.updateFavoriteParticipant= +pollen.error.serviceList.createAccountForPersonList= +pollen.error.serviceList.deleteAccountFromPersonList= +pollen.error.serviceMail.sendEmail= +pollen.error.servicePoll.addComment= +pollen.error.servicePoll.canAdminPoll= +pollen.error.servicePoll.createChoice= +pollen.error.servicePoll.createComment= +pollen.error.servicePoll.createPoll= +pollen.error.servicePoll.createUpdateVote= +pollen.error.servicePoll.delete= +pollen.error.servicePoll.deleteChoice= +pollen.error.servicePoll.deleteComment= +pollen.error.servicePoll.deletePoll= +pollen.error.servicePoll.deleteVote= +pollen.error.servicePoll.getAllPolls= +pollen.error.servicePoll.getComments= +pollen.error.servicePoll.getNbComments= +pollen.error.servicePoll.getNbPollsByUser= +pollen.error.servicePoll.getNbTotalPolls= +pollen.error.servicePoll.getNewChoice= +pollen.error.servicePoll.getNewComment= +pollen.error.servicePoll.getNewPoll= +pollen.error.servicePoll.getNewPollList= +pollen.error.servicePoll.getNewPollParticipant= +pollen.error.servicePoll.getPoll= +pollen.error.servicePoll.getPollForResults= +pollen.error.servicePoll.getPollForUpdate= +pollen.error.servicePoll.getPollForVote= +pollen.error.servicePoll.getPolls= +pollen.error.servicePoll.getPollsByUser= +pollen.error.servicePoll.getRestrictedAccount=Unable to retrieve restricted account with accountUid \= %1$s and poll with uid \= %2$s +pollen.error.servicePoll.getRunningPolls= +pollen.error.servicePoll.getVotes= +pollen.error.servicePoll.savePoll= +pollen.error.servicePoll.setPollClosed= +pollen.error.servicePoll.updatePoll= +pollen.error.serviceResults.importPoll= +pollen.error.serviceUser.connect= +pollen.error.serviceUser.createDefaultAdmin= +pollen.error.serviceUser.createFavoriteList= +pollen.error.serviceUser.createFavoriteParticipant= +pollen.error.serviceUser.createList= +pollen.error.serviceUser.createUpdateList= +pollen.error.serviceUser.createUpdateUser= +pollen.error.serviceUser.createUser= +pollen.error.serviceUser.deleteFavoriteList= +pollen.error.serviceUser.deleteFavoriteParticipant= +pollen.error.serviceUser.deleteList= +pollen.error.serviceUser.deleteUser= +pollen.error.serviceUser.getAccounts= +pollen.error.serviceUser.getFavoriteLists= +pollen.error.serviceUser.getFavoriteParticipants= +pollen.error.serviceUser.getNbAccounts= +pollen.error.serviceUser.getNbFavoriteParticipants= +pollen.error.serviceUser.getNbUsers= +pollen.error.serviceUser.getNewAccount= +pollen.error.serviceUser.getNewFavoriteList= +pollen.error.serviceUser.getNewFavoriteParticipant= +pollen.error.serviceUser.getNewList= +pollen.error.serviceUser.getNewPerson= +pollen.error.serviceUser.getNewUser= +pollen.error.serviceUser.getPerson= +pollen.error.serviceUser.getUsers= +pollen.error.serviceUser.updateFavoriteParticipant= +pollen.error.serviceUser.updateUser= +pollen.error.serviceVote.canVote= +pollen.error.serviceVote.deleteVote= +pollen.error.serviceVote.findPollAccount= +pollen.error.serviceVote.getNbVotes= +pollen.error.serviceVote.getNewPollAccount= +pollen.error.serviceVote.getNewVote= +pollen.error.serviceVote.getPollAccount= +pollen.error.serviceVote.getVote= +pollen.error.serviceVote.getVotes= +pollen.error.serviceVote.getVotesByPoll=Unable to load votes from poll with uid \= %1$s +pollen.error.serviceVote.hasAlreadyVoted=Unable test vote existing for account with votingId \= %1$s and poll with uid \= %2$s +pollen.error.serviceVote.saveVote= +pollen.exception.favorite_list_name_exist= +pollen.exception.favorite_participant_exist= +pollen.exception.favorite_participant_exist_without_email= +pollen.exception.load_configuration= +pollen.exception.participant_doubloons= +pollen.exception.participant_exist= +pollen.exception.participant_exist_without_email= +pollen.exception.poll_exist= +pollen.exception.poll_not_exist=No such poll exists. Please make sure that you are using the correct link and copy it completely into your browser's address field. +pollen.exception.smtp_not_available= +pollen.exception.user_email_exist= +pollen.exception.user_login_exist= +pollen.exception.user_not_exist= +pollen.exception.user_wrong_password= +pollen.exception.vote_doubloon= +pollen.exception.vote_not_allowed= +pollen.info.admin.created=Super admin was created with login %1$s +pollen.info.admin.exists=Super admin already exists +pollen.info.start=Start Pollen +pollen.info.started=Pollen is started \! +pollen.info.stop=Stop Pollen +pollen.text.empty= +pollen.ui.choice.add.submit=Add +pollen.ui.choice.add.title=Adding a choice +pollen.ui.choice.datePattern=MM/dd/yyyy h\:mm a +pollen.ui.choice.delete.confirm=Are you sure you want to delete this choice ? +pollen.ui.choice.delete.title=Delete this choice +pollen.ui.error.upload=An error occurred while uploading files. Maximum size allowed is %$1s per file, and %$2s total. +pollen.ui.user.cancelEdit=Cancel changes +pollen.ui.user.delete=Delete this user account +pollen.ui.user.delete.confirmMessage=Are you sure you want to definitively delete this user ? +pollen.ui.user.edit=Edit this user account +pollen.ui.user.save=Save this user account +pollen.ui.vote.noPager=%$1d existing votes +pollen.ui.vote.noVote=Aucune personne n'a encore participé au sondage +reminderEmail_msg=You have not yet voted for the poll "%s".\nYou can still participate with the identifier %s by following this link\: \n%s +reminderEmail_subject=[Pollen] Reminder (%s) +return=Return +save=Save +validate=Validate +voteEmail_msg=A vote has been submitted for the poll "%s". There are now %d votes for this poll.\nYou can access to this poll by following the links below.\n\nVote page\: \n%s\nEdit page\: \n%s +voteEmail_subject=[Pollen] Vote reporting (%s) +votingEmail_msg=A new poll has been created\: "%s".\nYou can participate with the identifier %s by following this link\: \n%s +votingEmail_subject=[Pollen] Invitation to vote (%s) Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,228 @@ +addChoice-choiceDate-regexp=\\d{2}/\\d{2}/\\d{4}( \\d{2}\\\:\\d{2})? +addChoice-choiceDate-regexp-message=La date de début doit-être au format 31/12/2000 23\:59. +addChoice-choiceDate-required-message=Vous devez saisir un choix. +addChoice-choiceImage-regexp=\\.(jpe?g|gif|png|JPE?G|GIF|PNG)$ +addChoice-choiceImage-regexp-message=L'image doit-être au format JPG, GIF ou PNG. +addChoice-choiceImage-required-message=Vous devez saisir un choix. +addChoice-choiceText-required-message=Vous devez saisir un choix. +choiceDate-label=Date et heure +choiceDateField-label=Date et heure +choiceDateField-regexp=\\d{2}/\\d{2}/\\d{4}( \\d{2}\\\:\\d{2})? +choiceDateField-regexp-message=La date doit-être au format 31/12/2000 23\:59. +choiceDescription-label=Description +choiceImage-label=Image +choiceImageField-label=Image +choiceImageField-regexp=\\.(jpe?g|gif|png|JPE?G|GIF|PNG)$ +choiceImageField-regexp-message=L'image doit-être au format JPG, GIF ou PNG. +choiceText-label=Choix +connectionLegend=Connexion +date-pattern=dd/MM/yyyy HH\:mm +editEmail-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ +editEmail-regexp-message=Adresse email invalide. +email-label=Email +email-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ +email-regexp-message=Adresse email invalide. +firstName-label=Prénom +groupName-label=Nom du groupe +lastName-label=Nom +listName-label=Nom +listSelect-label=Liste +login-label=Identifiant +loginComp-label=Identifiant +loginComp-required-message=Vous devez entrer votre identifiant. +loginFailed=Mauvais identifiant ou mot de passe. +loginSubmit=Me connecter +name-label=Nom +participantEmail-regexp=^([a-zA-Z0-9_.+-])+(a)(([a-zA-Z0-9-])+.)+([a-zA-Z0-9]{2,4})+$ +participantEmail-regexp-message=Adresse email invalide. +passwordComp-label=Mot de passe +passwordComp-required-message=Vous devez entrer votre mot de passe. +pollen.email.createPoll.content=Vous venez de créer le sondage "%1$s".\nVous pouvez y accéder en suivant les liens ci-dessous.\n\nPage de vote \: \n%2$s\nModération des votes \: \n%3$s\nPage de modification \: \n%4$s +pollen.email.createPoll.subject=[Pollen] Création d'un sondage (%1$s) +pollen.email.userRegister.content=Bienvenue %1$s. Vous venez de créer un compte sur l'application de sondage en ligne Pollen.\n\nIdentifiant \: %2$s\nMot de passe \: %3$s\n\nVous pouvez dès maintenant gérer vos sondages en vous identifiant sur le site \: \n%4$s +pollen.email.userRegister.subject=[Pollen] Confirmation de création du compte %s +pollen.error.context.close=Erreur lors de la fermeture de la transaction +pollen.error.context.getRootContext=Erreur lors de la récupération du contexte principale +pollen.error.context.parse=Erreur lors du parse du fichier de configuration %1$s +pollen.error.context.rollback=Erreur lors de l'annulation de la transaction +pollen.error.context.start=Erreur lors du démarrage de l'application +pollen.error.context.stop=Erreur lors de l'arrêt de l'application +pollen.error.encodePassword= +pollen.error.serviceEmail.createEmail= +pollen.error.serviceEmail.getNewEmail= +pollen.error.serviceEmail.sendEmail= +pollen.error.serviceFavorite.createFavoriteList= +pollen.error.serviceFavorite.createFavoriteParticipant= +pollen.error.serviceFavorite.deleteFavoriteList= +pollen.error.serviceFavorite.deleteFavoriteParticipant= +pollen.error.serviceFavorite.getFavoriteLists= +pollen.error.serviceFavorite.getFavoriteParticipant= +pollen.error.serviceFavorite.getFavoriteParticipants= +pollen.error.serviceFavorite.getNbFavoriteParticipants= +pollen.error.serviceFavorite.getNewFavoriteList= +pollen.error.serviceFavorite.getNewFavoriteParticipant= +pollen.error.serviceFavorite.updateFavoriteParticipant= +pollen.error.serviceList.createAccountForPersonList= +pollen.error.serviceList.deleteAccountFromPersonList= +pollen.error.serviceMail.sendEmail=Erreur lors de l'envoi de l'email sur le serveur %1$s\:%2$d pour %3$s de la part de %4$s +pollen.error.servicePoll.addComment=Impossible d'ajouter un nouveau commentaire créé par %1$s pour le sondage %2$s (%3$s) +pollen.error.servicePoll.canAdminPoll= +pollen.error.servicePoll.createChoice= +pollen.error.servicePoll.createComment= +pollen.error.servicePoll.createPoll=Impossible d'enregistrer le sondage %1$s créé par %2$s +pollen.error.servicePoll.createUpdateVote= +pollen.error.servicePoll.deleteChoice= +pollen.error.servicePoll.deleteComment=Impossible de supprimer le commentaire ayant pour identifiant "%1$s", appartenenant au sondage %2$s (%3$s) +pollen.error.servicePoll.deletePoll=Impossible de supprimer le sondage ayant pou identifiant "%1$s" +pollen.error.servicePoll.deleteVote= +pollen.error.servicePoll.getAllPolls= +pollen.error.servicePoll.getComments= +pollen.error.servicePoll.getNbComments= +pollen.error.servicePoll.getNbPollsByUser= +pollen.error.servicePoll.getNbTotalPolls= +pollen.error.servicePoll.getNewChoice= +pollen.error.servicePoll.getNewComment= +pollen.error.servicePoll.getNewPoll= +pollen.error.servicePoll.getNewPollList= +pollen.error.servicePoll.getNewPollParticipant= +pollen.error.servicePoll.getPoll= +pollen.error.servicePoll.getPollForResults= +pollen.error.servicePoll.getPollForUpdate= +pollen.error.servicePoll.getPollForVote= +pollen.error.servicePoll.getPolls= +pollen.error.servicePoll.getPollsByUser= +pollen.error.servicePoll.getRestrictedAccount=Unable to retrieve restricted account with accountUid \= %1$s and poll with uid \= %2$s +pollen.error.servicePoll.getRunningPolls= +pollen.error.servicePoll.getVotes= +pollen.error.servicePoll.savePoll= +pollen.error.servicePoll.setPollClosed= +pollen.error.servicePoll.updatePoll=Impossible de mettre à jour le sondage %1$s (%2$s) +pollen.error.serviceResults.importPoll= +pollen.error.serviceUser.connect=Impossible d'établir la connexion pour l'identifiant %1$s et le mot de passe encodé %2$s +pollen.error.serviceUser.createDefaultAdmin=Impossible de créer l'administrateur par défaut \: %1$s (%2$s) +pollen.error.serviceUser.createFavoriteList= +pollen.error.serviceUser.createFavoriteParticipant= +pollen.error.serviceUser.createList= +pollen.error.serviceUser.createUpdateList= +pollen.error.serviceUser.createUpdateUser=Impossible de créer l'utilisateur '%1$s' <%2$s> (admin \= %$3b) +pollen.error.serviceUser.createUser= +pollen.error.serviceUser.deleteFavoriteList= +pollen.error.serviceUser.deleteFavoriteParticipant= +pollen.error.serviceUser.deleteList= +pollen.error.serviceUser.deleteUser= +pollen.error.serviceUser.getAccounts= +pollen.error.serviceUser.getFavoriteLists= +pollen.error.serviceUser.getFavoriteParticipants= +pollen.error.serviceUser.getNbAccounts= +pollen.error.serviceUser.getNbFavoriteParticipants= +pollen.error.serviceUser.getNbUsers= +pollen.error.serviceUser.getNewAccount= +pollen.error.serviceUser.getNewFavoriteList= +pollen.error.serviceUser.getNewFavoriteParticipant= +pollen.error.serviceUser.getNewList= +pollen.error.serviceUser.getNewPerson= +pollen.error.serviceUser.getNewUser=Impossible d'instancier un nouvel utilisateur. +pollen.error.serviceUser.getPerson= +pollen.error.serviceUser.getUsers= +pollen.error.serviceUser.updateFavoriteParticipant= +pollen.error.serviceUser.updateUser= +pollen.error.serviceVote.canVote= +pollen.error.serviceVote.deleteVote= +pollen.error.serviceVote.findPollAccount= +pollen.error.serviceVote.getNbVotes= +pollen.error.serviceVote.getNewPollAccount= +pollen.error.serviceVote.getNewVote= +pollen.error.serviceVote.getPollAccount= +pollen.error.serviceVote.getVote= +pollen.error.serviceVote.getVotes= +pollen.error.serviceVote.getVotesByPoll= +pollen.error.serviceVote.hasAlreadyVoted= +pollen.error.serviceVote.saveVote= +pollen.exception.favorite_list_name_exist=La liste %1$s existe déjà pour l'utilisateur %2$s +pollen.exception.load_configuration=La configuration n'a pas été chargée correctement \! Veuillez vérifier le démarrage de l'application. +pollen.exception.participant_doubloons=Les doublons de la liste %1$s ont été ignorés \: %2$s +pollen.exception.participant_exist=La liste %1$s contient déjà un votant nommé %2$s avec un email %3$s +pollen.exception.participant_exist_without_email=La liste %1$s contient déjà un votant nommé %2$s avec aucun email +pollen.exception.poll_exist= +pollen.exception.poll_not_exist=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complètement dans le champ d'adresse de votre navigateur. +pollen.exception.smtp_not_available=Impossible d'envoyer un email à %1$s. Serveur smtp indisponible pour l'envoi d'email, veuillez contacter un administrateur. +pollen.exception.user_email_exist=Un utilisateur est déjà enregistré avec cet email. +pollen.exception.user_login_exist=Un utilisateur est déjà enregistré avec cet identifiant. +pollen.exception.user_not_exist=L'identifiant '%1$s' ne correspond à aucun utilisateur connu. +pollen.exception.user_wrong_password=Le mot de passe renseigné est incorrect pour l'utilisateur '%1$s'. +pollen.exception.vote_doubloon= +pollen.exception.vote_not_allowed= +pollen.info.admin.created=Le super admin a été créé avec l'identifiant %1$s. +pollen.info.admin.exists=Le super admin existe déjà +pollen.info.start=Démarrage de Pollen... +pollen.info.started=Pollen a été démarré avec succès \! +pollen.info.stop=Arrêt de Pollen +pollen.page.AdminUsers.title=Gestion des utilisateurs +pollen.page.PollLinks.title=Liens d'accès au sondage +pollen.page.UserLists.title=Vos listes de votants +pollen.ui.button.add=Ajouter +pollen.ui.button.create=Créer +pollen.ui.button.ok=Ok +pollen.ui.choice.add.submit=Ajouter +pollen.ui.choice.add.title=Ajout d'un choix +pollen.ui.choice.datePattern=dd/MM/yyyy HH\:mm +pollen.ui.choice.delete.confirm=Etes-vous sûr de vouloir définitivement supprimer ce choix ? +pollen.ui.choice.delete.title=Supprimer ce choix +pollen.ui.error.upload=Une erreur s'est produite lors du transfert des fichiers. La taille maximale autorisée est de %1$s par fichier et %2$s au total. +pollen.ui.list.create.success=La liste %1$s a été créée avec succès. +pollen.ui.list.create.title=Créer une nouvelle liste +pollen.ui.list.create.weightHelp=Ce chiffre correspond au poids du vote de la personne, c'est à dire le nombre de voix que possède la personne dans le sondage. +pollen.ui.list.delete=Supprimer la liste %1$s +pollen.ui.list.delete.confirmMessage=Etes-vous sûr de vouloir définitivement supprimer cette liste et l'intégralité de ses votants ? +pollen.ui.list.delete.success=La liste et son contenu ont été supprimé avec succès. +pollen.ui.list.emptyList=Liste vide. Ajoutez des votants en saisissant leur nom et email. +pollen.ui.list.nbParticipants=%1$d votants contenus dans cette liste +pollen.ui.list.notSelected=Aucune liste sélectionnée +pollen.ui.list.update.addParticipant=Ajouter un nouveau votant à la liste +pollen.ui.list.update.addParticipant.success=Le votant %1$s a été ajouté à la liste. +pollen.ui.list.update.cancelEdition=Annuler les changements +pollen.ui.list.update.removeParticipant=Supprimer ce votant +pollen.ui.list.update.removeParticipant.confirmMessage=Etes-vous sûr de vouloir supprimer %1$s de la liste ? +pollen.ui.list.update.removeParticipant.success=Le votant a été supprimé avec succès. +pollen.ui.list.update.saveParticipant=Enregistrer les modifications +pollen.ui.list.update.saveParticipant.success=Modification enregistrée avec succès. +pollen.ui.list.update.updateParticipant=Modifier ce votant +pollen.ui.participant.add=Nouveau participant +pollen.ui.participant.email-label=Email +pollen.ui.participant.name-label=Nom +pollen.ui.participant.weight-label=Poids +pollen.ui.poll.form.confirmlistChange=Des changements ont été effectués sur la/les liste(s), un changement de restriction supprimera les modifications. Voulez-vous continuer ? +pollen.ui.poll.links.adminVotePage=Lien d'accès modérateur à la page des votes \: +pollen.ui.poll.links.creatorEmail.notDefined=Aucun email n'a été défini à la création du sondage, vous devriez enregistrer cette page dans vos favoris pour ne pas perdre les liens. +pollen.ui.poll.links.creatorEmail.success=Un email vous a été envoyé avec les liens ci-dessous. +pollen.ui.poll.links.editPage=Lien d'accès à la modification du sondage \: +pollen.ui.poll.links.myPolls=Mes sondages +pollen.ui.poll.links.notAllowed=L'url est incorrect, vous n'êtes pas autorisé à accéder aux liens du sondage. +pollen.ui.poll.links.pollName=%1$s par %2$s +pollen.ui.poll.links.register=Si vous êtes un utilisateur identifié, vous pouvez retrouver ces liens dans la page +pollen.ui.poll.links.uriNotDefined=Page inaccessible sans identifiant du sondage dans l'url \! +pollen.ui.poll.links.votePage=Lien d'accès publique à la page des votes \: +pollen.ui.tooltip.help=Aide +pollen.ui.user.create.emailFailedShowPassword=Le mot de passe généré est le suivant \: %1$s +pollen.ui.user.create.passwordGenerated=Le mot de passe du nouvel utilisateur a été généré. +pollen.ui.user.create.passwordHelp=Si vous précisez un email, un mot de passe sera généré et envoyé à l'utilisateur. Sinon le mot de passe sera identique au login. +pollen.ui.user.create.passwordSameAsLogin=Le mot de passe du nouvel utilisateur est le même que son identifiant. +pollen.ui.user.create.sendEmail=Un email a été envoyé au nouvel utilisateur %1$s à l'adresse %2$s. +pollen.ui.user.create.success=L'utilisateur %1$s a été créé avec succès. +pollen.ui.user.create.title=Créer un nouvel utilisateur +pollen.ui.user.delete=Supprimer cet utilisateur +pollen.ui.user.delete.confirmMessage=Etes-vous sûr de vouloir définitivement supprimer cet utilisateur ? +pollen.ui.user.display.notAllowed=Vous n'avez pas les droits nécessaires pour accéder à la page %1$s. +pollen.ui.user.display.notConnected=Vous devez vous connecter pour accéder à la page %1$s. +pollen.ui.user.nbUsers=%1$d utilisateurs existants +pollen.ui.user.register.autoConnection=Vous êtes maintenant connecté avec l'identifiant %1$s. +pollen.ui.user.register.sendEmail=Un email vous a été envoyé à l'adresse %1$s. +pollen.ui.user.update.cancel=Annuler les changements +pollen.ui.user.update.edit=Modifier cet utilisateur +pollen.ui.user.update.save=Enregistrer les modifications +pollen.ui.user.update.success=Modification enregistrée avec succès. +pollen.ui.user.validate.passwords=Les deux mots de passe ne correspondent pas. +pollen.ui.vote.delete.confirmMessage=Etes-vous sûr de vouloir supprimer ce vote ? +pollen.ui.vote.noPager=%1$d votes existants +pollen.ui.vote.noVote=Aucune personne n'a encore participé au sondage +weight-label=Poids Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + +import org.junit.Before; +import org.junit.Rule; + +/** + * For each test, create an isolated transaction context, in a H2 database. + * The H2 file is stored in a directory depending on the test class name, the + * test method name, and a timestamp (allowing you to run tests multiple times + * to see how database changed between each test run). + * <p/> + * Any unit test of a service should subclass this class and use the + * {@link #newService(Class)} to get a service ready to be used. + */ +public abstract class AbstractPollenServiceTest extends PollenServiceSupport { + + @Rule + public FakeServiceContext serviceContext = new FakeServiceContext(); + + @Before + public void setUp() throws Exception { + serviceContext.setServiceFactory(new PollenServiceFactory()); + setServiceContext(serviceContext); + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,197 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + + +import com.google.common.base.Supplier; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenTopiaRootContextFactory; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.util.DateUtil; + +import java.io.File; +import java.util.Date; +import java.util.Locale; +import java.util.UUID; + +/** + * Provide an implementation of {@link PollenServiceContext} suitable for repeatable, + * isolated tests requiring a database. + */ +public class FakeServiceContext extends TestWatcher implements PollenServiceContext { + + public static final String CONFIGURATION_PATH = "pollen-fake.properties"; + + protected Supplier<TopiaContext> rootContextSupplier; + + private static final Log log = LogFactory.getLog(FakeServiceContext.class); + + /** A time-stamp, allow to make multiple build and keep the tests data. */ + protected static final String TIMESTAMP = String.valueOf(System.nanoTime()); + + protected PollenServiceFactory serviceFactory; + + protected TopiaContext rootContext; + + protected TopiaContext transaction; + + protected Date fakeCurrentTime; + + protected File getTestSpecificDirectory(Description description) { + // Trying to look for the temporary folder to store data for the test + String tempDirPath = System.getProperty("java.io.tmpdir"); + if (tempDirPath == null) { + // can this really occur ? + tempDirPath = ""; + if (log.isWarnEnabled()) { + log.warn("'\"java.io.tmpdir\" not defined"); + } + } + File tempDirFile = new File(tempDirPath); + + // create the directory to store database data + String dataBasePath = description.getClassName() + + File.separator // a directory with the test class name + + description.getMethodName()// a sub-directory with the method name + + '_' + + TIMESTAMP; // and a timestamp + File databaseFile = new File(tempDirFile, dataBasePath); + return databaseFile; + } + + public Supplier<TopiaContext> getRootContextSupplier() { + return rootContextSupplier; + } + + @Override + protected void starting(Description description) { + super.starting(description); + description.getMethodName(); + PollenTopiaRootContextFactory factory = + new PollenTopiaRootContextFactory(); + File testDir = getTestSpecificDirectory(description); + if (log.isInfoEnabled()) { + log.info("Test dir = " + testDir); + } + rootContext = factory.newEmbeddedDatabase( + testDir, "/" + CONFIGURATION_PATH); + } + + @Override + protected void finished(Description description) { + super.finished(description); + if (!rootContext.isClosed()) { + try { + rootContext.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } + + /** May be used in test to get a fresh transaction. */ + @Override + public TopiaContext getTransaction() { + if (transaction == null) { + try { + transaction = rootContext.beginTransaction(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + return transaction; + } + + public TopiaContext newTransaction() throws TopiaException { + return rootContext.beginTransaction(); + } + + @Override + public Date getCurrentTime() { + if (fakeCurrentTime == null) { + throw new IllegalStateException("le service testé a besoin de " + + "connaître la date, il faudrait en préciser une de test via les" + + " méthodes serviceContext#setCurrentTime(...)"); + } else { + log.trace("injecting fake date in service : " + fakeCurrentTime); + } + return fakeCurrentTime; + } + + public void setCurrentTime(Date fakeCurrentTime) { + this.fakeCurrentTime = fakeCurrentTime; + } + + public void setCurrentTime(int day, int month, int year) { + Date date = DateUtil.createDate(day, month, year); + setCurrentTime(date); + } + + @Override + public void setTransaction(TopiaContext transaction) { + } + + @Override + public Locale getLocale() { + return Locale.getDefault(); + } + + /** + * Create an id to easily managed polls using urls. + * + * @return a fresh generated String + */ + @Override + public String createPollenUrlId() { + return UUID.randomUUID().toString().replaceAll("-", ""); + } + + @Override + public PollenConfiguration getConfiguration() { + PollenConfiguration configuration + = new PollenConfiguration(CONFIGURATION_PATH); + return configuration; + } + + @Override + public PollenServiceFactory getServiceFactory() { + return serviceFactory; + } + + @Override + public <E extends PollenService> E newService(Class<E> clazz) { + return serviceFactory.newService(clazz, this); + } + + public void setServiceFactory(PollenServiceFactory serviceFactory) { + this.serviceFactory = serviceFactory; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,62 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.impl.EmailService; +import org.junit.Before; +import org.junit.Test; + +/** + * Test {@link EmailService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class EmailServiceTest extends AbstractPollenServiceTest { + + @Override + @Before + public void setUp() throws Exception { + + serviceContext.setCurrentTime(5, 10, 2011); + + super.setUp(); + } + + @Test + public void testCreateEmail() throws Exception { + + } + + @Test + public void testSendEmail() throws Exception { + + } + + @Test + public void testGetNewEmail() throws Exception { + + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,109 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Tests the {@link FavoriteService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +@Ignore +public class FavoriteServiceTest extends AbstractPollenServiceTest { + + /** Logger. */ + private static final Log log = LogFactory.getLog(FavoriteServiceTest.class); + + @Override + @Before + public void setUp() throws Exception { + + serviceContext.setCurrentTime(5, 10, 2011); + + super.setUp(); + } + + @Test + public void testCreateFavoriteParticipant() throws Exception { + + } + + @Test + public void testUpdateFavoriteParticipant() throws Exception { + + } + + @Test + public void testDeleteFavoriteParticipant() throws Exception { + + } + + @Test + public void testGetFavoriteParticipant() throws Exception { + + } + + @Test + public void testGetFavoriteParticipants() throws Exception { + + } + + @Test + public void testGetFavoriteLists() throws Exception { + + } + + @Test + public void testDeleteFavoriteList() throws Exception { + + } + + @Test + public void testCreateFavoriteList() throws Exception { + + } + + @Test + public void testGetNbFavoriteParticipants() throws Exception { + + } + + @Test + public void testGetNewFavoriteParticipant() throws Exception { + + } + + @Test + public void testGetNewFavoriteList() throws Exception { + + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,171 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.impl.PollService; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.topia.TopiaException; + +/** + * Tests the {@link PollService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +@Ignore +public class PollServiceTest extends AbstractPollenServiceTest { + + @Override + @Before + public void setUp() throws Exception { + + serviceContext.setCurrentTime(5, 10, 2011); + + super.setUp(); + + } + + @Test + public void testUpdatePollNotStartedWithChoice() throws TopiaException { + + } + + @Test + public void testGetPollsByUser() throws TopiaException { + + } + + @Test + public void testFetchOnGetter() throws Exception { + + } + + @Test + public void testGetNewPoll() throws Exception { + + } + + @Test + public void testCreatePoll() throws Exception { + + } + + @Test + public void testUpdatePoll() throws Exception { + + } + + @Test + public void testDeletePoll() throws Exception { + + } + + @Test + public void testDeleteChoice() throws Exception { + + } + + @Test + public void testGetPolls() throws Exception { + + } + + @Test + public void testGetComments() throws Exception { + + } + + @Test + public void testGetNewPollList() throws Exception { + + } + + @Test + public void testGetNewPollParticipant() throws Exception { + + } + + @Test + public void testGetPoll() throws Exception { + + } + + @Test + public void testCanAdminPoll() throws Exception { + + } + + @Test + public void testGetNbTotalPolls() throws Exception { + + } + + @Test + public void testGetNbPollsByUser() throws Exception { + + } + + @Test + public void testGetRunningPolls() throws Exception { + + } + + @Test + public void testGetNbComments() throws Exception { + + } + + @Test + public void testCreateComment() throws Exception { + + } + + @Test + public void testDeleteComment() throws Exception { + + } + + @Test + public void testGetNewComment() throws Exception { + + } + + @Test + public void testCreateChoice() throws Exception { + + } + + @Test + public void testGetNewChoice() throws Exception { + + } + + @Test + public void testSetPollClosed() throws Exception { + + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,84 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.impl.UserService; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; + +/** + * Tests the {@link UserService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +@Ignore +public class UserServiceTest extends AbstractPollenServiceTest { + + @Override + @Before + public void setUp() throws Exception { + + serviceContext.setCurrentTime(5, 10, 2011); + + super.setUp(); + } + + @Test + public void testConnect() throws Exception { + + } + + @Test + public void testGetNewUser() throws Exception { + + } + + @Test + public void testCreateUser() throws Exception { + + } + + @Test + public void testUpdateUser() throws Exception { + + } + + @Test + public void testDeleteUser() throws Exception { + + } + + @Test + public void testGetUsers() throws Exception { + + } + + @Test + public void testGetNbUsers() throws Exception { + + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,92 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.impl.VoteService; +import org.junit.Before; +import org.junit.Test; + +/** + * Tests the {@link VoteService}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class VoteServiceTest extends AbstractPollenServiceTest { + + @Override + @Before + public void setUp() throws Exception { + + serviceContext.setCurrentTime(5, 10, 2011); + + super.setUp(); + } + + @Test + public void testCanVote() throws Exception { + + } + + @Test + public void testGetNewPollAccount() throws Exception { + + } + + @Test + public void testGetPollAccount() throws Exception { + + } + + @Test + public void testGetVotes() throws Exception { + + } + + @Test + public void testDeleteVote() throws Exception { + + } + + @Test + public void testGetNbVotes() throws Exception { + + } + + @Test + public void testGetNewVote() throws Exception { + + } + + @Test + public void testSaveVote() throws Exception { + + } + + @Test + public void testFindPollAccount() throws Exception { + + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,26 @@ +### +# #%L +# Pollen :: Business +# +# $Id$ +# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ +# %% +# 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 Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/largemaillist.sh ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ +### +# #%L +# Pollen :: Services +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +# Default to info level output; this is very handy if you eventually use Hibernate as well. +log4j.rootCategory=warn, A1 + +# A1 is set to be a ConsoleAppender. +log4j.appender.A1=org.apache.log4j.ConsoleAppender + +# A1 uses PatternLayout. +log4j.appender.A1.layout=org.apache.log4j.PatternLayout +log4j.appender.A1.layout.ConversionPattern=%d [%p] %c{2} %m%n + +log4j.logger.org.chorem.pollen=debug + +log4j.logger.org.chorem.pollen.business.PollenContextImpl=warn +log4j.logger.org.chorem.pollen.business.services.SendMail=warn Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,34 @@ +### +# #%L +# Pollen :: Services +# +# $Id$ +# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-services… $ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver + +upImgDir=${testDirectory}/.pollen/uploadedImages +feedDir=${testDirectory}/.pollen/feeds +pollen.emails.directory=${testDirectory}/.pollen/emails Property changes on: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-ui/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui/pom.xml 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-ui/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -3,217 +3,165 @@ 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> - <groupId>org.chorem</groupId> - <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-SNAPSHOT</version> + </parent> - <groupId>org.chorem.pollen</groupId> - <artifactId>pollen-ui</artifactId> + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-ui</artifactId> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>pollen-business</artifactId> - <version>${project.version}</version> - </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.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> - <dependency> - <groupId>com.opensymphony</groupId> - <artifactId>xwork-core</artifactId> - <version>2.1.6</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-spring-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-config-browser-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-business</artifactId> + <version>${project.version}</version> + </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.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + <dependency> + <groupId>com.opensymphony</groupId> + <artifactId>xwork-core</artifactId> + <version>2.1.6</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + </dependency> + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Pollen :: Web Interface</name> - <description>Interface Web Tapestry pour Pollen</description> + <name>Pollen :: UI (Tapestry)</name> + <description>Interface Web Tapestry pour Pollen</description> -  -  -  +  +  +  - <packaging>war</packaging> + <packaging>war</packaging> - <properties> - <redmine.releaseFiles> - target/${project.build.finalName}.war - </redmine.releaseFiles> - - <i18n.collectOutputName>app</i18n.collectOutputName> - <i18n.bundleOutputName>app</i18n.bundleOutputName> - - <struts2Version>2.1.8.1</struts2Version> - </properties> + <properties> + <redmine.releaseFiles> + target/${project.build.finalName}.war + </redmine.releaseFiles> - <reporting> -  -  - </reporting> + <i18n.collectOutputName>app</i18n.collectOutputName> + <i18n.bundleOutputName>app</i18n.bundleOutputName> - <build> -  - <finalName>pollen-${project.version}</finalName> + </properties> -  - <plugins> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <archive> - <manifest> - <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> - </manifest> - </archive> - <overlays> - <overlay> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <type>jar</type> - <includes> - <include>**/war/Winstone*</include> - </includes> - </overlay> - <overlay> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <type>jar</type> - </overlay> - </overlays> - </configuration> - </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <configuration> - <connectors> - <connector - implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> - <port>8888</port> - </connector> - </connectors> - </configuration> - </plugin> - </plugins> - </build> + <build> +  + <finalName>pollen-${project.version}</finalName> -  + <plugins> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.util.war.WinstoneLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <type>jar</type> + <includes> + <include>**/war/Winstone*</include> + </includes> + </overlay> + <overlay> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <connectors> + <connector + implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <port>8888</port> + </connector> + </connectors> + </configuration> + </plugin> + </plugins> + </build> - chenillekit Repository - <repository> - <id>chenillekit</id> - <url>http://www.chenillekit.org/mvnrepo/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - </repository> - - Maven Java.net Repository - <repository> - <id>maven2-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url>http://download.java.net/maven/2/</url> - <layout>default</layout> - </repository> - </repositories> --> </project> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,238 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-ui-struts2</artifactId> + + <dependencies> +  + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-persistence</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-services</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + </dependency> + +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <scope>runtime</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>Pollen :: UI (strust2)</name> + <description>Interface Graphique Struts2 pour Pollen</description> + + +  +  +  + + <packaging>war</packaging> + + <properties> + <i18n.silent>true</i18n.silent> + <i18n.bundleOutputName>pollen-i18n</i18n.bundleOutputName> + + <redmine.releaseFiles> + target/${project.build.finalName}.war + </redmine.releaseFiles> + </properties> + + <build> + +  + <finalName>pollen-${project.version}</finalName> + +  + <plugins> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserValidation</goal> + <goal>parserJava</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <webAppConfig> + <contextPath>/pollen</contextPath> + </webAppConfig> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> + </manifest> + </archive> + <overlays> + <overlay> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <type>jar</type> + <includes> + <include>**/war/Jetty*</include> + </includes> + </overlay> + <overlay> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <type>jar</type> + </overlay> + </overlays> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + </build> + +</project> + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/THIRD-PARTY.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,34 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License - Version 2.0 +# - BSD License +# - BSD-style license +# - CDDL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Affero General Public License version 3 +# - GPLv2+CE +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - JDOM Apache-like license +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 30 01:33:46 CET 2012 +antlr--antlr--2.7.6=BSD License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,66 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.chorem.pollen.PollenConfiguration; +import org.nuiton.topia.TopiaContext; + +import java.net.URL; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenApplicationContext { + + protected PollenConfiguration configuration; + + protected TopiaContext rootContext; + + protected URL applicationUrl; + + public PollenConfiguration getConfiguration() { + return configuration; + } + + public void setConfiguration(PollenConfiguration configuration) { + this.configuration = configuration; + } + + public TopiaContext getRootContext() { + return rootContext; + } + + public void setRootContext(TopiaContext rootContext) { + this.rootContext = rootContext; + } + + public URL getApplicationUrl() { + return applicationUrl; + } + + public void setApplicationUrl(URL applicationUrl) { + this.applicationUrl = applicationUrl; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,234 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.PollenTopiaRootContextFactory; +import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.business.persistence.ChoiceTypeDAO; +import org.chorem.pollen.business.persistence.PollType; +import org.chorem.pollen.business.persistence.PollTypeDAO; +import org.chorem.pollen.business.persistence.VoteCounting; +import org.chorem.pollen.business.persistence.VoteCountingDAO; +import org.chorem.pollen.entities.PollenDAOHelper; +import org.chorem.pollen.services.DefaultPollenServiceContext; +import org.chorem.pollen.services.PollenServiceContext; +import org.chorem.pollen.services.PollenServiceFactory; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.DefaultI18nInitializer; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +/** + * To listen start or end of the application. + * <p/> + * On start we will load the configuration and check connection to internal + * database, creates schema and create an admin user in none found in database. + * <p/> + * On stop, just release the application configuration. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenApplicationListener implements ServletContextListener { + + /** Logger. */ + protected static final Log log = + LogFactory.getLog(PollenApplicationListener.class); + + private TopiaContext rootContext; + + @Override + public void contextInitialized(ServletContextEvent sce) { + + if (log.isInfoEnabled()) { + log.info("Application starting at " + new Date() + "..."); + } + + // init I18n + DefaultI18nInitializer i18nInitializer = + new DefaultI18nInitializer("pollen-i18n"); + i18nInitializer.setMissingKeyReturnNull(true); + I18n.init(i18nInitializer, Locale.getDefault()); + + PollenApplicationContext applicationContext = new PollenApplicationContext(); + sce.getServletContext().setAttribute(PollenActionSupport.APPLICATION_CONTEXT_PARAMETER, applicationContext); + + // initialize configuration + PollenConfiguration configuration = new PollenConfiguration(); + applicationContext.setConfiguration(configuration); + + if (log.isInfoEnabled()) { + log.info("Initializing RootContextSupplier..."); + } + PollenTopiaRootContextFactory factory = + new PollenTopiaRootContextFactory(); + rootContext = factory.newDatabaseFromConfig(configuration); + applicationContext.setRootContext(rootContext); + + // init database (and create minimal admin user if required) + try { + initDB(applicationContext); + + } catch (TopiaException e) { + throw new PollenTechnicalException("Could not init db", e); + } + } + + @Override + public void contextDestroyed(ServletContextEvent sce) { + + if (log.isInfoEnabled()) { + log.info("Application is ending at " + new Date() + "..."); + } + if (rootContext != null) { + if (log.isInfoEnabled()) { + log.info("Shuting down RootContextSupplier..."); + } + if (!rootContext.isClosed()) { + try { + rootContext.closeContext(); + } catch (TopiaException te) { + if (log.isErrorEnabled()) { + log.error("Could not close rootContext", te); + } + } + } + } + } + + protected void initDB(PollenApplicationContext applicationContext) throws TopiaException { + PollenConfiguration configuration = + applicationContext.getConfiguration(); + + PollenServiceFactory serviceFactory = + new PollenServiceFactory(); + TopiaContext transaction = rootContext.beginTransaction(); + + PollenServiceContext serviceContext = DefaultPollenServiceContext.newContext( + Locale.getDefault(), + transaction, + configuration, + serviceFactory + ); + + PollenServiceSupport pollenServiceSupport = + serviceFactory.newService(PollenServiceSupport.class, serviceContext); + + List<PollType> pollTypes = + pollenServiceSupport.getEntities(PollType.class); + + if (CollectionUtils.isEmpty(pollTypes)) { + + // db is empty, let's create references + + + try { + createDefaultPollTypes(configuration, transaction); + + createDefaultChoiceTypes(configuration, transaction); + + createDefaultVoteCountings(configuration, transaction); + + createDefaultAdmin(serviceFactory, serviceContext); + + transaction.commitTransaction(); + + } finally { + closeTransaction(transaction); + } + + } + } + + private void createDefaultVoteCountings(PollenConfiguration configuration, TopiaContext transaction) throws TopiaException { + VoteCountingDAO voteCountingDAO = PollenDAOHelper.getVoteCountingDAO(transaction); + List<String> defaultVoteCountings = configuration.getDefaultVoteCountings(); + for (String defaultVoteCounting : defaultVoteCountings) { + if (log.isInfoEnabled()) { + log.info("Create default vote counting '" + defaultVoteCounting + "'"); + } + voteCountingDAO.create(VoteCounting.PROPERTY_NAME, defaultVoteCounting); + } + } + + private void createDefaultChoiceTypes(PollenConfiguration configuration, TopiaContext transaction) throws TopiaException { + ChoiceTypeDAO choiceTypeDAO = PollenDAOHelper.getChoiceTypeDAO(transaction); + List<String> defaultChoiceTypes = configuration.getDefaultChoiceTypes(); + for (String defaultChoiceType : defaultChoiceTypes) { + if (log.isInfoEnabled()) { + log.info("Create default choice type '" + defaultChoiceType + "'"); + } + choiceTypeDAO.create(ChoiceType.PROPERTY_NAME, defaultChoiceType); + } + } + + private void createDefaultPollTypes(PollenConfiguration configuration, TopiaContext transaction) throws TopiaException { + PollTypeDAO pollTypeDAO = PollenDAOHelper.getPollTypeDAO(transaction); + List<String> defaultPollTypes = configuration.getDefaultPollTypes(); + for (String defaultPollType : defaultPollTypes) { + if (log.isInfoEnabled()) { + log.info("Create default poll type '" + defaultPollType + "'"); + } + pollTypeDAO.create(PollType.PROPERTY_NAME, defaultPollType); + } + } + + + private void createDefaultAdmin(PollenServiceFactory serviceFactory, + PollenServiceContext serviceContext) { + + UserService service = + serviceFactory.newService(UserService.class, serviceContext); + + service.createDefaultUsers(); + + } + + /** + * Try to close the given transaction. + * + * @param tx the transaction to close + * @throws TopiaException if could not close the transaction + */ + protected void closeTransaction(TopiaContext tx) throws TopiaException { + if (tx != null && !tx.isClosed()) { + tx.closeContext(); + } + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,51 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.persistence.UserAccount; + +/** + * User session to put in servlet session. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenSession { + + /** Logger. */ + private static final Log log = LogFactory.getLog(PollenSession.class); + + /** User loggued account (if anonymous, then userAccount is null). */ + private UserAccount userAccount; + + public UserAccount getUserAccount() { + return userAccount; + } + + public void setUserAccount(UserAccount userAccount) { + this.userAccount = userAccount; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,62 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.web.filter.TopiaTransactionFilter; + +/** + * EchoBase implementation of the {@link TopiaTransactionFilter}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenTopiaTransactionFilter extends TopiaTransactionFilter { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenTopiaTransactionFilter.class); + + @Override + protected TopiaContext beginTransaction() throws TopiaRuntimeException { + PollenApplicationContext applicationContext = + PollenActionSupport.getPollenApplicationContext(); + + TopiaContext rootContext = applicationContext.getRootContext(); + try { + TopiaContext transaction = rootContext.beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Starts a new echo transaction " + transaction); + } + return transaction; + } catch (TopiaException eee) { + throw new TopiaRuntimeException("Could not start transaction", eee); + } + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,77 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.struts2.ServletActionContext; +import org.chorem.pollen.PollenTechnicalException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.net.MalformedURLException; +import java.net.URL; + +/** + * Usefull ui methods. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenUIUtils { + + public static void redirect(String url) throws Exception { + + HttpServletResponse response = ServletActionContext.getResponse(); + HttpServletRequest request = ServletActionContext.getRequest(); + + String path = request.getContextPath(); + if (!url.startsWith("/")) { + path += "/"; + } + response.sendRedirect(path + url); + } + + public static URL getApplicationBase(HttpServletRequest request) { + + // get port + String port; + if ("http".equalsIgnoreCase(request.getScheme()) && request.getServerPort() != 80 || + "https".equalsIgnoreCase(request.getScheme()) && request.getServerPort() != 443) { + port = ":" + request.getServerPort(); + } else { + port = ""; + } + + String applicationBase = request.getScheme() + "://" + request.getServerName() + + port + request.getContextPath(); + try { + return new URL(applicationBase); + } catch (MalformedURLException e) { + throw new PollenTechnicalException( + "Could not compute pollen url", e); + } + } + + protected PollenUIUtils() { + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,242 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions; + +import com.google.common.collect.Lists; +import com.opensymphony.xwork2.ActionContext; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.ServletActionContext; +import org.apache.struts2.StrutsStatics; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.services.PollenService; +import org.chorem.pollen.services.PollenServiceContext; +import org.chorem.pollen.services.DefaultPollenServiceContext; +import org.chorem.pollen.services.PollenServiceFactory; +import org.chorem.pollen.ui.PollenApplicationContext; +import org.chorem.pollen.ui.PollenSession; +import org.chorem.pollen.ui.PollenUIUtils; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.framework.TopiaTransactionAware; +import org.nuiton.web.filter.TopiaTransactionFilter; +import org.nuiton.web.struts2.BaseAction; + +import javax.servlet.http.HttpServletRequest; +import java.net.URL; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; + +/** + * Pollen action support. + * <p/> + * <b>Note :</b> All actions must implement this class to have a better i18n + * support, when a i18n key is not translated it has a empty translation and + * we do NOT want this behaviour in gui, prefer to return the marked + * untranslated key. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollenActionSupport extends BaseAction implements TopiaTransactionAware { + + private static final long serialVersionUID = 1L; + + /** Key to store the {@link PollenSession} instance in the session's map. */ + protected static final String SESSION_PARAMETER = "pollenSession"; + + /** Key to store the single instance of the application context */ + public static final String APPLICATION_CONTEXT_PARAMETER = "pollenApplicationContext"; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenActionSupport.class); + + private SimpleDateFormat dateFormat; + + private SimpleDateFormat monthFormat; + + public static PollenApplicationContext getPollenApplicationContext() { + Map<String, Object> application = getActionContext().getApplication(); + PollenApplicationContext applicationContext = + (PollenApplicationContext) application.get(APPLICATION_CONTEXT_PARAMETER); + return applicationContext; + } + + public PollenConfiguration getConfiguration() { + return getPollenApplicationContext().getConfiguration(); + } + + /** Pollen User session. */ + private transient PollenSession pollenSession; + + /** + * Provides a way to get a service. + * <p/> + * Actions may <strong>not</strong> call it directly by use + * {@link #newService(Class)} instead. + */ + protected transient PollenServiceFactory serviceFactory; + + protected transient PollenServiceContext serviceContext; + + protected transient TopiaContext transaction; + + public String getPageLogo() { + return "Index"; + } + + public PollenSession getPollenSession() { + if (pollenSession == null) { + + // load it from session + Map<String, Object> strutsSession = + getActionContext().getSession(); + PollenSession session = (PollenSession) + strutsSession.get(SESSION_PARAMETER); + + if (session == null) { + + // create an empty session + session = new PollenSession(); + + // and store it in the struts session + strutsSession.put(SESSION_PARAMETER, session); + } + pollenSession = session; + } + return pollenSession; + } + + public static String getApplicationVersion() { + return getPollenApplicationContext().getConfiguration().getVersion().toString(); + } + + public URL getApplicationUrl() { + URL url = getPollenApplicationContext().getApplicationUrl(); + if (url == null) { + + // first time asking this, let's compute it + url = PollenUIUtils.getApplicationBase(ServletActionContext.getRequest()); + if (log.isInfoEnabled()) { + log.info("Pollen application url : " + url); + } + getPollenApplicationContext().setApplicationUrl(url); + } + return url; + } + + /** + * Fabrique pour récupérer le ServiceContext tel qu'il devrait être fourni + * à la fabrication d'un service. + * + * @return service context + */ + protected PollenServiceContext getServiceContext() { + if (serviceContext == null) { + serviceContext = DefaultPollenServiceContext.newContext( + getLocale(), + getTransaction(), + getConfiguration(), + getServiceFactory() + ); + } + return serviceContext; + } + + public PollenServiceFactory getServiceFactory() { + if (serviceFactory == null) { + serviceFactory = new PollenServiceFactory(); + } + return serviceFactory; + } + + /** + * Sub-classes should use this method to easily get a service instance. + * + * @param serviceClass The type of service to instantiate + * @return A newly created service of the expected type with necessary data set + */ + public <E extends PollenService> E newService(Class<E> serviceClass) { + E service = getServiceFactory().newService(serviceClass, + getServiceContext()); + return service; + } + + @Override + public TopiaContext getTransaction() { + if (transaction == null) { + HttpServletRequest request = (HttpServletRequest) + getActionContext().get(StrutsStatics.HTTP_REQUEST); + transaction = TopiaTransactionFilter.getTransaction(request); + } + return transaction; + } + + @Override + public void setTransaction(TopiaContext transaction) { + this.transaction = transaction; + } + + public String formatDate(Date date) { + String result = getDateFormat().format(date); + return result; + } + + public String formatMonth(Date date) { + String result = getMonthFormat().format(date); + return result; + } + + public static final List<String> SAFE_LANGUAGES = + Lists.newArrayList("en", "fr"); + + public String getSafeLanguage() { + String language = getLocale().getLanguage(); + if (!SAFE_LANGUAGES.contains(language)) { + language = SAFE_LANGUAGES.get(0); + } + return language; + } + + protected SimpleDateFormat getDateFormat() { + if (dateFormat == null) { + dateFormat = new SimpleDateFormat("dd/MM/yyyy"); + } + return dateFormat; + } + + protected SimpleDateFormat getMonthFormat() { + if (monthFormat == null) { + monthFormat = new SimpleDateFormat("mm-yyyy"); + } + return monthFormat; + } + + protected static ActionContext getActionContext() { + return ActionContext.getContext(); + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,36 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.admin; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ManagePolls extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,130 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.admin; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; +import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ManageUsers extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected String action; + + protected UserAccount user; + + public UserAccount getUser() { + if (user == null) { + UserService service = newService(UserService.class); + user = service.getNewUser(); + } + return user; + } + + public String getAction() { + return action; + } + + public void setAction(String action) { + this.action = action; + } + + public String createUser() throws Exception { + + Preconditions.checkNotNull(user); + + UserService service = newService(UserService.class); + + try { + service.createUser(user, true, getApplicationUrl()); + getTransaction().commitTransaction(); + addActionMessage( + _("pollen.information.user.created", user.getDisplayName())); + // remove this user, otherwise it will be reused in the user lists + user = null; + action = null; + return SUCCESS; + } catch (UserLoginAlreadyUsedException e) { + addFieldError("user.login", _("pollen.error.user.login.already.used")); + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } + + return INPUT; + } + + public String updateUser() throws Exception { + + Preconditions.checkNotNull(user); + + UserService service = newService(UserService.class); + + try { + service.updateUser(user, null, true); + getTransaction().commitTransaction(); + addActionMessage( + _("pollen.information.user.updated", user.getDisplayName())); + + // remove this user, otherwise it will be reused in the user lists + user = null; + action = null; + return SUCCESS; + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } catch (UserInvalidPasswordException e) { + addFieldError("user.password", _("pollen.error.user.invalid.password")); + } + + return INPUT; + } + + public String deleteUser() throws Exception { + + Preconditions.checkNotNull(user); + + UserService service = newService(UserService.class); + + service.deleteUser(user.getLogin()); + getTransaction().commitTransaction(); + + addActionMessage( + _("pollen.information.user.deleted", user.getDisplayName())); + + // remove this user, otherwise it will be reused in the user lists + user = null; + action = null; + return SUCCESS; + } + + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,119 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts2.json.JSONException; +import org.apache.struts2.json.JSONUtil; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.PagerUtil; + +/** + * Abstract JSON action with pagination support. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public abstract class AbstractJSONPaginedAction extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public abstract Integer getRows(); + + public abstract Integer getPage(); + + public abstract Integer getTotal(); + + public abstract Integer getRecords(); + + protected PagerUtil.PagerBean pager = PagerUtil.newPagerBean(); + + // sorting order - asc or desc + protected String sord; + + // get index row - i.e. user click to sort. + protected String sidx; + + protected String filters; + + public void setRows(Integer rows) { + pager.setPageSize(rows); + } + + public void setPage(Integer page) { + pager.setPageIndex(page); + } + + public String getSord() { + return sord; + } + + public void setSord(String sord) { + this.sord = sord; + } + + public String getSidx() { + return sidx; + } + + public void setSidx(String sidx) { + this.sidx = sidx; + } + + public String getFilters() { + return filters; + } + + public void setFilters(String filters) { + this.filters = filters; + } + + protected String getSortColumn() { + String result = null; + if (useSort()) { + result = sidx; + } + return result; + } + + protected Boolean isSortAscendant() { + Boolean result = null; + if (useSort()) { + result = "asc".equals(sord); + } + return result; + } + + protected boolean useSort() { + return StringUtils.isNotEmpty(sidx); + } + + protected Object getFilterObject() throws JSONException { + Object filterObject = null; + if (StringUtils.isNotEmpty(filters)) { + filterObject = JSONUtil.deserialize(filters); + } + return filterObject; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,89 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.impl.UserService; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.List; +import java.util.Map; + +/** + * Obtain paginated users. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class GetPolls extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] polls; + + public Map<String, Object>[] getPolls() { + return polls; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + List<UserAccount> allUsers = userService.getUsers(pager); + + polls = new Map[allUsers.size()]; + Binder<UserAccount, UserAccount> binder = + BinderFactory.newBinder(UserAccount.class); + int index = 0; + for (UserAccount user : allUsers) { + Map<String, Object> map = binder.obtainProperties(user); + map.put("id", user.getTopiaId()); + polls[index++] = map; + } + + return SUCCESS; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,76 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import com.google.common.collect.Maps; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.Map; + +/** + * Get user datas (for json purpose). + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class GetUser extends PollenActionSupport { + private static final long serialVersionUID = 1L; + + private String userId; + + private transient Map<String, Object> user; + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public Map<String, Object> getUser() { + return user; + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + UserAccount userAccount = userService.getEntityById(UserAccount.class, userId); + + user = Maps.newHashMap(); + + Binder<UserAccount, UserAccount> binder = + BinderFactory.newBinder(UserAccount.class); + user = binder.obtainProperties(userAccount); + user.put("id", userAccount.getTopiaId()); + + return SUCCESS; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,89 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.json; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.impl.UserService; +import org.nuiton.util.beans.Binder; +import org.nuiton.util.beans.BinderFactory; + +import java.util.List; +import java.util.Map; + +/** + * Obtain paginated users. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class GetUsers extends AbstractJSONPaginedAction { + + private static final long serialVersionUID = 1L; + + protected transient Map<String, Object>[] users; + + public Map<String, Object>[] getUsers() { + return users; + } + + @Override + public Integer getRows() { + return pager.getPageSize(); + } + + @Override + public Integer getPage() { + return pager.getPageIndex(); + } + + @Override + public Integer getTotal() { + return pager.getPagesNumber(); + } + + @Override + public Integer getRecords() { + return pager.getRecords(); + } + + @Override + public String execute() throws Exception { + + UserService userService = newService(UserService.class); + + List<UserAccount> allUsers = userService.getUsers(pager); + + users = new Map[allUsers.size()]; + Binder<UserAccount, UserAccount> binder = + BinderFactory.newBinder(UserAccount.class); + int index = 0; + for (UserAccount user : allUsers) { + Map<String, Object> map = binder.obtainProperties(user); + map.put("id", user.getTopiaId()); + users[index++] = map; + } + + return SUCCESS; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,170 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import com.google.common.collect.Maps; +import com.opensymphony.xwork2.Preparable; +import org.chorem.pollen.PollenFunctions; +import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollType; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.business.persistence.VoteCounting; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.impl.PollService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +import java.util.List; +import java.util.Map; + +/** + * Creates a new poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class CreatePoll extends PollenActionSupport implements Preparable { + + private static final long serialVersionUID = 1L; + + protected Poll poll; + + protected Map<String, PollType> pollTypes; + + protected Map<String, VoteCounting> voteCountings; + + protected Map<String, ChoiceType> choiceTypes; + + protected boolean notification; + + protected boolean reminder; + + protected boolean limitChoice; + + protected int reminderHourCountdown; + + protected int notificationNumber; + + public String getPageLogo() { + return "Creation"; + } + + public Poll getPoll() { + if (poll == null) { + UserAccount userAccount = getPollenSession().getUserAccount(); + poll = newService(PollService.class).getNewPoll(userAccount); + } + return poll; + } + + public Map<String, PollType> getPollTypes() { + return pollTypes; + } + + public Map<String, VoteCounting> getVoteCountings() { + return voteCountings; + } + + public Map<String, ChoiceType> getChoiceTypes() { + return choiceTypes; + } + + public boolean isNotification() { + return notification; + } + + public void setNotification(boolean notification) { + this.notification = notification; + } + + public boolean isReminder() { + return reminder; + } + + public void setReminder(boolean reminder) { + this.reminder = reminder; + } + + public boolean isLimitChoice() { + return limitChoice; + } + + public void setLimitChoice(boolean limitChoice) { + this.limitChoice = limitChoice; + } + + public int getReminderHourCountdown() { + return reminderHourCountdown; + } + + public void setReminderHourCountdown(int reminderHourCountdown) { + this.reminderHourCountdown = reminderHourCountdown; + } + + public int getNotificationNumber() { + return notificationNumber; + } + + public void setNotificationNumber(int notificationNumber) { + this.notificationNumber = notificationNumber; + } + + @Override + public String execute() throws Exception { + + PollService service = newService(PollService.class); + +// try { +// Poll basicPoll = service.createBasicPoll(poll); +// +// return SUCCESS; +// } catch (TopiaException e) { +// +// } + + // back to input + return INPUT; + } + + @Override + public void prepare() throws Exception { + + PollenServiceSupport service = + newService(PollenServiceSupport.class); + + List<PollType> pollTypeList = service.getEntities(PollType.class); + pollTypes = Maps.uniqueIndex(pollTypeList, + PollenFunctions.ENTITY_BY_ID); + + List<VoteCounting> voteCountingList = + service.getEntities(VoteCounting.class); + voteCountings = Maps.uniqueIndex(voteCountingList, + PollenFunctions.ENTITY_BY_ID); + + List<ChoiceType> choiceTypeList = service.getEntities(ChoiceType.class); + choiceTypes = Maps.uniqueIndex(choiceTypeList, + PollenFunctions.ENTITY_BY_ID); + + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display list of created polls. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class DisplayCreatedPolls extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayCreatedPolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display list of participated polls. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class DisplayParticipatedPolls extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayParticipatedPolls.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class DisplayPoll extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPoll.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.poll; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Display results of a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class DisplayPollResult extends PollenActionSupport { + + private static final long serialVersionUID = 1L; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/DisplayPollResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,83 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import com.opensymphony.xwork2.interceptor.annotations.InputConfig; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; +import org.chorem.pollen.services.exceptions.UserNotFoundException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Login user to pollen. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Login extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected String login; + + protected String password; + + public String getLogin() { + return login; + } + + public void setLogin(String login) { + this.login = login; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @InputConfig(resultName = "error") + @Override + public String execute() throws Exception { + + UserService service = newService(UserService.class); + + try { + UserAccount userAccount = service.connect(login, password); + getPollenSession().setUserAccount(userAccount); + addActionMessage(_("pollen.information.your.are.loggued")); + return SUCCESS; + } catch (UserNotFoundException e) { + addActionError(_("pollen.error.user.bad.login.or.password")); + } catch (UserInvalidPasswordException e) { + addActionError(_("pollen.error.user.bad.login.or.password")); + } + + // if error go back to input + return ERROR; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,45 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Logout from pollen. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class Logout extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + @Override + public String execute() throws Exception { + + getPollenSession().setUserAccount(null); + + return SUCCESS; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,92 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Register a new user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class RegisterUser extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected UserAccount user; + + protected String password2; + + public UserAccount getUser() { + if (user == null) { + UserService service = newService(UserService.class); + user = service.getNewUser(); + } + return user; + } + + public String getPassword2() { + return password2; + } + + public void setPassword2(String password2) { + this.password2 = password2; + } + + public String getPageLogo() { + return "Creation"; + } + + @Override + public String execute() throws Exception { + + UserService service = newService(UserService.class); + + try { + UserAccount createdUser = service.createUser(user, false, getApplicationUrl()); + getTransaction().commitTransaction(); + + getPollenSession().setUserAccount(createdUser); + addActionMessage(_("pollen.information.your.are.loggued")); + return SUCCESS; + } catch (UserLoginAlreadyUsedException e) { + addFieldError("user.login", _("pollen.error.user.login.already.used")); + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } + + // if error go back to input + + // reset password + user.setPassword(null); + password2 = null; + + return INPUT; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/RegisterUser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,47 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Show user account. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class ShowUser extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + public String getPageLogo() { + return "Creation"; + } + + public UserAccount getUser() { + return getPollenSession().getUserAccount(); + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ShowUser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,115 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.actions.user; + +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException; +import org.chorem.pollen.services.exceptions.UserInvalidPasswordException; +import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * Update a user. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class UpdateUser extends PollenActionSupport { + + private static final long serialVersionUID = 1L; + + protected UserAccount user; + + protected String newPassword; + + protected String newPassword2; + + public String getPageLogo() { + return "Creation"; + } + + public UserAccount getUser() { + if (user == null) { + UserService service = newService(UserService.class); + user = service.getNewUser(); + } + return user; + } + + public String getNewPassword() { + return newPassword; + } + + public void setNewPassword(String newPassword) { + this.newPassword = newPassword; + } + + public String getNewPassword2() { + return newPassword2; + } + + public void setNewPassword2(String newPassword2) { + this.newPassword2 = newPassword2; + } + + public String input() throws Exception { + UserAccount userAccount = getPollenSession().getUserAccount(); + UserService userService = newService(UserService.class); + user = userService.getEntityById(UserAccount.class, userAccount.getTopiaId()); + return INPUT; + } + + @Override + public String execute() throws Exception { + + // let's push back admin property to user to save + user.setAdministrator( + getPollenSession().getUserAccount().isAdministrator()); + + UserService service = newService(UserService.class); + + try { + UserAccount updatedUser = + service.updateUser(user, newPassword, false); + getTransaction().commitTransaction(); + + // push back user to session + getPollenSession().setUserAccount(updatedUser); + return SUCCESS; + } catch (UserEmailAlreadyUsedException e) { + addFieldError("user.email", _("pollen.error.user.email.already.used")); + } catch (UserInvalidPasswordException e) { + addFieldError("user.password", _("pollen.error.user.invalid.password")); + } + + // if error go back to input + + // reset password + user.setPassword(null); + newPassword = newPassword2 = null; + + return INPUT; + } + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/UpdateUser.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,86 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.interceptors; + +import com.google.common.base.Preconditions; +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.ui.PollenSession; +import org.chorem.pollen.ui.PollenUIUtils; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * To check if logged user is admin. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class CheckUserIsAdmin extends AbstractInterceptor { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = LogFactory.getLog(CheckUserIsAdmin.class); + + /** Where to redirect where user is loggued */ + protected String redirectAction; + + public void setRedirectAction(String redirectAction) { + this.redirectAction = redirectAction; + } + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + PollenActionSupport action = (PollenActionSupport) invocation.getAction(); + + PollenSession echoBaseSession = action.getPollenSession(); + + UserAccount user = echoBaseSession.getUserAccount(); + Preconditions.checkNotNull(user, "No user found is session"); + + boolean check = user.isAdministrator(); + + String result = null; + + if (!check) { + + if (log.isInfoEnabled()) { + log.info("User not admin try to acces admin section..."); + } + + if (log.isInfoEnabled()) { + log.info("Will redirect to " + redirectAction); + } + PollenUIUtils.redirect(redirectAction); + + } else { + result = invocation.invoke(); + } + return result; + } +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,100 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.interceptors; + +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.ui.PollenSession; +import org.chorem.pollen.ui.PollenUIUtils; +import org.chorem.pollen.ui.actions.PollenActionSupport; + +/** + * To check user is loggued. If not, then redirect to the {@link #loginAction}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class CheckUserIsLogguedInterceptor extends AbstractInterceptor { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(CheckUserIsLogguedInterceptor.class); + + /** Where to redirect if user is not authenticated. */ + protected String loginAction; + + /** Where to redirect where user is loggued */ + protected String redirectAction; + + public void setLoginAction(String loginAction) { + this.loginAction = loginAction; + } + + public void setRedirectAction(String redirectAction) { + this.redirectAction = redirectAction; + } + + protected static final String URL_PATTERN = "%s?redirectAction=%s"; + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + PollenActionSupport action = (PollenActionSupport) invocation.getAction(); + + PollenSession echoBaseSession = action.getPollenSession(); + boolean userLoggued = echoBaseSession.getUserAccount() != null; + + if (!userLoggued && log.isInfoEnabled()) { + log.info("No user loggued!"); + } + + String result = null; + + if (!userLoggued) { + + // redirect to login + + String url = String.format(URL_PATTERN, + loginAction, + redirectAction + ); + if (log.isInfoEnabled()) { + log.info("Will redirect to " + url); + } + PollenUIUtils.redirect(url); + + } else { + + result = invocation.invoke(); + } + + return result; + } + + +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,79 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <package name="admin" extends="default" namespace="/admin"> + + <default-interceptor-ref name="pollenBasicAdminStack"/> + +  + <action name="usersList" method="input" + class="org.chorem.pollen.ui.actions.admin.ManageUsers"> +  + <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> + </action> + +  + <action name="createUser" method="createUser" + class="org.chorem.pollen.ui.actions.admin.ManageUsers"> + <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> + <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> + <result>/WEB-INF/jsp/admin/usersList.jsp</result> + </action> + +  + <action name="updateUser" method="updateUser" + class="org.chorem.pollen.ui.actions.admin.ManageUsers"> + <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> + <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> + <result>/WEB-INF/jsp/admin/usersList.jsp</result> + </action> + +  + <action name="deleteUser" method="deleteUser" + class="org.chorem.pollen.ui.actions.admin.ManageUsers"> + <interceptor-ref name="pollenParamsPrepareParamsAdminStack"/> + <result name="input">/WEB-INF/jsp/admin/usersList.jsp</result> + <result>/WEB-INF/jsp/admin/usersList.jsp</result> + </action> + +  + <action name="pollsList" method="input" + class="org.chorem.pollen.ui.actions.admin.ManagePolls"> +  + <result name="input">/WEB-INF/jsp/admin/pollsList.jsp</result> + </action> + + </package> + + +</struts> + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <package name="json" extends="default" namespace="/json"> + +  + <action name="getUsers" + class="org.chorem.pollen.ui.actions.json.GetUsers"> + <interceptor-ref name="pollenBasicAdminStack"/> + <result type="json"/> + </action> + +  + <action name="getUser" + class="org.chorem.pollen.ui.actions.json.GetUser"> + <interceptor-ref name="pollenBasicAdminStack"/> + <result type="json"/> + </action> + +  + <action name="getPolls" + class="org.chorem.pollen.ui.actions.json.GetPolls"> + <interceptor-ref name="pollenBasicAdminStack"/> + <result type="json"/> + </action> + + </package> + +</struts> + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,76 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <package name="poll" extends="default" namespace="/poll"> + + +  + <action name="createPoll" + class="org.chorem.pollen.ui.actions.poll.CreatePoll"> + <result name="input">/WEB-INF/jsp/poll/createPoll.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="displayPoll" + class="org.chorem.pollen.ui.actions.poll.DisplayPoll"> + <result name="input">/WEB-INF/jsp/poll.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="displayPollResult" + class="org.chorem.pollen.ui.actions.poll.DisplayPollResult"> + <result name="input">/WEB-INF/jsp/pollResult.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="displayCreatedPolls" + class="org.chorem.pollen.ui.actions.poll.DisplayCreatedPolls"> + <result name="input">/WEB-INF/jsp/createdPolls.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + +  + <action name="displayParticipatedPolls" + class="org.chorem.pollen.ui.actions.poll.DisplayParticipatedPolls"> + <result name="input">/WEB-INF/jsp/participatedPolls.jsp</result> + <result>/WEB-INF/jsp/home.jsp</result> + </action> + + + </package> + + +</struts> + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <package name="user" extends="default" namespace="/user"> + +  + <action name="login" class="org.chorem.pollen.ui.actions.user.Login"> + <result name="error">/WEB-INF/jsp/home.jsp</result> + <result type="redirectToHome"/> + </action> + +  + <action name="registerUser" + class="org.chorem.pollen.ui.actions.user.RegisterUser"> + <result name="input">/WEB-INF/jsp/user/registerUser.jsp</result> + <result type="redirectToHome"/> + </action> + +  + <action name="showUser" + class="org.chorem.pollen.ui.actions.user.ShowUser"> + <result>/WEB-INF/jsp/user/showUser.jsp</result> + </action> + +  + <action name="updateUser" + class="org.chorem.pollen.ui.actions.user.UpdateUser"> + <result name="input">/WEB-INF/jsp/user/updateUser.jsp</result> + <result type="redirectAction"> + <param name="actionName">showUser</param> + <param name="namespace">/user</param> + </result> + </action> + +  + <action name="logout" class="org.chorem.pollen.ui.actions.user.Logout"> + <result type="redirectToHome"/> + </action> + + </package> + + +</struts> + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,87 @@ +poll.common.select.choiceType=Select the type of choice +pollen.action.create=Create +pollen.action.createPoll=Create the poll +pollen.action.createUser=Create a new user +pollen.action.delete=Delete +pollen.action.deleteUser=Delete selected user +pollen.action.editUser=Edit selected user +pollen.action.login=Log me In +pollen.action.modify=Modify +pollen.action.register=Register +pollen.action.validate=Submit +pollen.common.administrator=Admin +pollen.common.beginChoiceDate=Begin choice date +pollen.common.beginDate=Begin date +pollen.common.bugReport=Bug report +pollen.common.description=Description +pollen.common.email=Em@il +pollen.common.endChoiceDate=end choice date +pollen.common.endDate=End date +pollen.common.firstName=First name +pollen.common.lastName=Last name +pollen.common.license=Licence +pollen.common.login=Login +pollen.common.newPassword=New password +pollen.common.newPassword2=Reenter new passworsd +pollen.common.or=or +pollen.common.password=Password +pollen.common.password2=Renter your password +pollen.common.pollOption.anonymous=Anonymous +pollen.common.pollOption.anonymousVoteAllowed=Anonymous vote allowed +pollen.common.pollOption.choiceAddAllowed=Allow adding choices +pollen.common.pollOption.continuousResults=Continous results +pollen.common.pollOption.limitChoice=Limit number of choice per vote +pollen.common.pollOption.maxChoiceNb=Limit +pollen.common.pollOption.notification=Receive notification emails +pollen.common.pollOption.notificationNumber=After each n votes +pollen.common.pollOption.publicResults=Public results +pollen.common.pollOption.reminder=Send reminder emails +pollen.common.pollOption.reminderHourCountdown=Hours before end +pollen.common.pollType=Poll type +pollen.common.title=Title +pollen.common.userSupport=User support +pollen.common.voteCountingType=Counting type +pollen.error.email.required=You must provide a email +pollen.error.login.required=You must provide a login +pollen.error.password.required=Your must provide a password +pollen.error.password2.required=You must repeat your password for confirmation +pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.user.bad.login.or.password=Login or password invalid. +pollen.error.user.email.already.used=This email is already used +pollen.error.user.invalid.password=Invalid password +pollen.error.user.login.already.used=This login is already used +pollen.fieldset.connexionInformation=Information de connexion +pollen.fieldset.login=Login +pollen.fieldset.poll.choices=Choices +pollen.fieldset.poll.general=Your poll +pollen.fieldset.poll.options=Options +pollen.fieldset.poll.you=You +pollen.fieldset.userInformation=Informations de l'utilisateur +pollen.fieldset.userInformation.toCreate=User informations to create +pollen.fieldset.userInformation.toDelete=User informations to delete +pollen.fieldset.userInformation.toUpdate=User informations to update +pollen.information.need.login=You must be logged to access this page. Please fill the form below. +pollen.information.user.created=User %s created. +pollen.information.user.deleted=User %s deleted. +pollen.information.user.updated=User %s updated. +pollen.information.your.are.loggued=You are logged. +pollen.label.contact.administrator=Send an email to an administrator +pollen.legend.login=Login +pollen.menu.admin=Administration +pollen.menu.createPoll=Create a poll +pollen.menu.displayCreatedPolls=Created polls +pollen.menu.displayParticipatedPolls=Participated polls +pollen.menu.displayVotingLists=Voting lists +pollen.menu.home=Home +pollen.menu.login=Log in +pollen.menu.logout=Log out +pollen.menu.managePolls=Manage Polls +pollen.menu.manageUsers=Manage Users +pollen.menu.polls=Polls +pollen.menu.preferences=My account +pollen.menu.register=Register +pollen.title.createPoll=Nouveau sondage +pollen.title.myAccount=My account +pollen.title.pollsList=Polls administration +pollen.title.register=Register +pollen.title.usersList=Gestion des utilisateurs Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,87 @@ +poll.common.select.choiceType=Sélectionner le type de choix +pollen.action.create=Créer +pollen.action.createPoll=Créer le sondage +pollen.action.createUser=Créer un nouvel utilisateur +pollen.action.delete=Supprimer +pollen.action.deleteUser=Supprimer un utilisateur sélectionné +pollen.action.editUser=Editer un utilisateur sélectionné +pollen.action.login=M'identifier +pollen.action.modify=Modifier +pollen.action.register=S'enregistrer +pollen.action.validate=Valider +pollen.common.administrator=Admin +pollen.common.beginChoiceDate=Date de début des choix +pollen.common.beginDate=Date de début +pollen.common.bugReport=Rapport de bug +pollen.common.description=Description +pollen.common.email=Em@il +pollen.common.endChoiceDate=Date de fin des choix +pollen.common.endDate=Date de fin +pollen.common.firstName=Prénom +pollen.common.lastName=Nom +pollen.common.license=Licence +pollen.common.login=Identifiant +pollen.common.newPassword=Nouveau mot de passe +pollen.common.newPassword2=Répétez votre nouveau mot de passe +pollen.common.or=ou +pollen.common.password=Mot de passe +pollen.common.password2=Répétez votre mot de passe +pollen.common.pollOption.anonymous=Sondage anonyme +pollen.common.pollOption.anonymousVoteAllowed=Autoriser le vote anonyme +pollen.common.pollOption.choiceAddAllowed=Autoriser l'ajout de choix +pollen.common.pollOption.continuousResults=Résultats continus +pollen.common.pollOption.limitChoice=Limiter le nombre de choix par vote +pollen.common.pollOption.maxChoiceNb=Limite +pollen.common.pollOption.notification=Recevoir des emails de notification +pollen.common.pollOption.notificationNumber=Tous les n votes +pollen.common.pollOption.publicResults=Résultats publics +pollen.common.pollOption.reminder=Envoyer des emails de rappel +pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage +pollen.common.pollType=Type de sondage +pollen.common.title=Titre +pollen.common.userSupport=Support utilisateur +pollen.common.x=Dépouillement +pollen.error.email.required=Courriel obligatoire +pollen.error.login.required=Login obligatoire +pollen.error.password.required=Mot de passe obligatoire +pollen.error.password2.required=Mot de passe répété obligatoire +pollen.error.passwords.not.equals=Les deux mots de passe saisis non identiques +pollen.error.user.bad.login.or.password=Mauvais identifiant ou mot de passe. +pollen.error.user.email.already.used=Le courriel saisi est déjà utilisé par un autre utilisateur +pollen.error.user.invalid.password=Mot de passe invalide +pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur +pollen.fieldset.connexionInformation=Information de connexion +pollen.fieldset.login=Connexion +pollen.fieldset.poll.choices=Les choix +pollen.fieldset.poll.general=Votre sondage +pollen.fieldset.poll.options=Les options +pollen.fieldset.poll.you=Vous +pollen.fieldset.userInformation=Informations de l'utilisateur +pollen.fieldset.userInformation.toCreate=Informations de l'utilisateur à créer +pollen.fieldset.userInformation.toDelete=Informations de l'utilisateur à supprimer +pollen.fieldset.userInformation.toUpdate=Informations de l'utilisateur à mettre à jour +pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. +pollen.information.user.created=L'utilisateur %s a été créé. +pollen.information.user.deleted=L'utilisateur %s a été supprimé. +pollen.information.user.updated=L'utilisateur %s a été mis à jour. +pollen.information.your.are.loggued=Vous êtes connecté. +pollen.label.contact.administrator=Contacter un administrateur +pollen.legend.login=Login +pollen.menu.admin=Administration +pollen.menu.createPoll=Créer un sondage +pollen.menu.displayCreatedPolls=Sondages créés +pollen.menu.displayParticipatedPolls=Sondages participés +pollen.menu.displayVotingLists=Listes de votants +pollen.menu.home=Accueil +pollen.menu.login=Identifiez-vous +pollen.menu.logout=Déconnexion +pollen.menu.managePolls=Gérer les sondages +pollen.menu.manageUsers=Gérer les utilisateurs +pollen.menu.polls=Sondages +pollen.menu.preferences=Mon compte +pollen.menu.register=Inscrivez-vous +pollen.title.createPoll=Nouveau sondage +pollen.title.myAccount=Mon compte +pollen.title.pollsList=Liste des sondages +pollen.title.register=S'enregistrer +pollen.title.usersList=Gestion des utilisateurs Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: UI (strust2) +# +# $Id$ +# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +log4j.rootCategory=ERROR, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d [%p] %c{2} %m%n + +log4j.logger.org.chorem.pollen=INFO Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,44 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/Login-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,65 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="user.password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + + <field name="password2"> + + <field-validator type="requiredstring" short-circuit="true"> + <message key="pollen.error.password2.required"/> + </field-validator> + + <field-validator type="fieldexpression"> + <param name="expression">password2.equals(user.password)</param> + <message key="pollen.error.passwords.not.equals"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/RegisterUser-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,61 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + </field> + + <field name="user.password"> + + <field-validator type="requiredstring"> + <message key="pollen.error.password.required"/> + </field-validator> + + </field> + + <field name="newPassword2"> + + <field-validator type="fieldexpression"> + <param name="expression">newPassword == null || newPassword == null || newPassword2.equals(newPassword)</param> + <message key="pollen.error.passwords.not.equals"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/UpdateUser-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,45 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-createUser-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,45 @@ + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator 1.0.2//EN" + "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> +<validators> + + <field name="user.login"> + + <field-validator type="requiredstring"> + <message key="pollen.error.login.required"/> + </field-validator> + + </field> + + <field name="user.email"> + + <field-validator type="requiredstring"> + <message key="pollen.error.email.required"/> + </field-validator> + + </field> + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-updateUser-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,34 @@ +### +# #%L +# Pollen :: UI (strust2) +# +# $Id$ +# $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password= +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.url=jdbc:h2:file:${pollen.dataDirectory}/db/pollendb + +## Version de l'application +pollen.version=${project.version} + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,169 @@ +<?xml version="1.0" encoding="UTF-8" ?> + + + +<!DOCTYPE struts PUBLIC + "-//Apache Software Foundation//DTD Struts Configuration 2.0//EN" + "http://struts.apache.org/dtds/struts-2.1.7.dtd"> + +<struts> + + <bean class="org.nuiton.web.struts2.I18nTextProvider" + name="i18nTextProvider" + type="com.opensymphony.xwork2.TextProvider"/> + <constant name="struts.xworkTextProvider" value="i18nTextProvider"/> + + <constant name="struts.ognl.allowStaticMethodAccess" value="true"/> + <constant name="struts.action.extension" value=",,"/> + <constant name="struts.locale" value="fr_FR"/> + <constant name="struts.i18n.reload" value="false"/> + <constant name="struts.configuration.xml.reload" value="false"/> + <constant name="struts.ui.theme" value="css_xhtml"/> + <constant name="struts.multipart.maxSize" value="209715200"/> + +  +  + <constant name="struts.freemarker.templatesCache" value="true"/> + + <package name="default" extends="json-default" namespace="/"> + + <result-types> + <result-type name="redirectToHome" + class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + <param name="namespace">/</param> + <param name="actionName">home</param> + </result-type> + </result-types> + + <interceptors> + +  + <interceptor name="paramRemover" + class="com.opensymphony.xwork2.interceptor.ParameterRemoverInterceptor"/> + + <interceptor name="checkUserLoggued" + class="org.chorem.pollen.ui.interceptors.CheckUserIsLogguedInterceptor"> + <param name="loginAction">/notLoggued</param> + <param name="redirectAction">/home</param> + </interceptor> + + <interceptor name="checkUserAdmin" + class="org.chorem.pollen.ui.interceptors.CheckUserIsAdmin"> + <param name="redirectAction">/notAdmin</param> + </interceptor> + +  + <interceptor-stack name="pollenBasicStack"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="basicStack"/> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> + </interceptor-stack> + + <interceptor-stack name="pollenBasicLogguedStack"> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="pollenBasicStack"/> + </interceptor-stack> + + <interceptor-stack name="pollenBasicAdminStack"> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkUserAdmin"/> + <interceptor-ref name="pollenBasicStack"/> + </interceptor-stack> + +  + <interceptor-stack name="pollenParamsPrepareParamsStack"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="paramsPrepareParamsStack"/> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> + </interceptor-stack> + + <interceptor-stack name="pollenParamsPrepareParamsLogguedStack"> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="pollenParamsPrepareParamsStack"/> + </interceptor-stack> + + <interceptor-stack name="pollenParamsPrepareParamsAdminStack"> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkUserAdmin"/> + <interceptor-ref name="pollenParamsPrepareParamsStack"/> + </interceptor-stack> + + </interceptors> + +  + <default-interceptor-ref name="pollenParamsPrepareParamsStack"/> + + <default-action-ref name="home"/> + +  + <default-class-ref + class="org.chorem.pollen.ui.actions.PollenActionSupport"/> + + <action name="notLoggued"> + <result>/WEB-INF/jsp/user/login.jsp</result> + </action> + + <action name="notAdmin"> + <result>/WEB-INF/jsp/adminRequired.jsp</result> + </action> + +  + <action name="home" + class="org.chorem.pollen.ui.actions.PollenActionSupport"> + <result>/WEB-INF/jsp/home.jsp</result> + <interceptor-ref name="store"> + <param name="operationMode">RETRIEVE</param> + </interceptor-ref> + </action> + +  + <action name="changeLang" + class="org.chorem.pollen.ui.actions.PollenActionSupport"> + + <result type="redirectToHome"/> + + <interceptor-ref name="i18nStack"/> +  + <interceptor-ref name="paramRemover"> + <param name="paramNames">request_locale</param> + </interceptor-ref> + <interceptor-ref name="store"> + <param name="operationMode">STORE</param> + </interceptor-ref> + </action> + + </package> + + <include file="config/struts-json.xml"/> + <include file="config/struts-admin.xml"/> + <include file="config/struts-poll.xml"/> + <include file="config/struts-user.xml"/> + +</struts> + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/checkbox.ftl 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,109 @@ +<#-- + #%L + EchoBase :: UI + + $Id: checkbox.ftl 3112 2012-01-23 23:10:51Z tchemit $ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% +--> +<#-- +NOTE: The 'header' stuff that follows is in this one file for checkbox due to the fact +that for checkboxes we do not want the label field to show up as checkboxes handle their own +lables +--> +<#assign hasFieldErrors = fieldErrors?? && fieldErrors[parameters.name]??/> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> + +<#if hasFieldErrors> +<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> +<#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> +</#list> +</div><#t/> +</#if> +<#if parameters.labelposition?default("left") == 'left'> +<span <#rt/> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> +<label<#t/> +<#if parameters.id??> + for="${parameters.id?html}"<#rt/> +</#if> +<#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> +<#else> + class="label"<#rt/> +</#if> +>${parameters.label?html} +<#if parameters.tooltip??> + <#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> +</#if> +</label><#rt/> +</span> +</#if> + +<#if parameters.labelposition?default("left") == 'top'> +<div <#rt/> +<#else> +<span <#rt/> +</#if> +<#if parameters.id??>id="wwctrl_${parameters.id}"<#rt/></#if> class="wwctrl"> + +<#if parameters.required?default(false)> + <span class="required">*</span><#t/> +</#if> + +<#include "/${parameters.templateDir}/simple/checkbox.ftl" /> +<#if parameters.labelposition?default("left") != 'left'> +<#if parameters.labelposition?default("left") == 'top'> +</div> <#rt/> +<#else> +</span> <#rt/> +</#if> +<#if parameters.label??> +<#if parameters.labelposition?default("left") == 'top'> +<div <#rt/> +<#else> +<span <#rt/> +</#if> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> +<label<#t/> +<#if parameters.id??> + for="${parameters.id?html}"<#rt/> +</#if> +<#if hasFieldErrors> + class="checkboxErrorLabel"<#rt/> +<#else> + class="checkboxLabel"<#rt/> +</#if> +>${parameters.label?html}</label><#rt/> +</#if> +</#if> +<#if parameters.label??> +<#if parameters.labelposition?default("left") == 'top'> +</div> <#rt/> +<#else> +</span> <#rt/> +</#if> +</#if> +</div> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/template/css_xhtml/controlheader-core.ftl 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,74 @@ +<#-- + #%L + EchoBase :: UI + + $Id: controlheader-core.ftl 3112 2012-01-23 23:10:51Z tchemit $ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% +--> +<#-- + Only show message if errors are available. + This will be done if ActionSupport is used. +--> +<#assign hasFieldErrors = parameters.name?? && fieldErrors?? && fieldErrors[parameters.name]??/> +<div <#rt/><#if parameters.id??>id="wwgrp_${parameters.id}"<#rt/></#if> class="wwgrp"> + +<#if hasFieldErrors> +<div <#rt/><#if parameters.id??>id="wwerr_${parameters.id}"<#rt/></#if> class="wwerr"> +<#list fieldErrors[parameters.name] as error> + <div<#rt/> + <#if parameters.id??> + errorFor="${parameters.id}"<#rt/> + </#if> + class="errorMessage"> + ${error?html} + </div><#t/> +</#list> +</div><#t/> +</#if> + +<#if parameters.label??> +<#if parameters.labelposition?default("top") == 'top'> +<div <#rt/> +<#else> +<span <#rt/> +</#if> +<#if parameters.id??>id="wwlbl_${parameters.id}"<#rt/></#if> class="wwlbl"> + <label <#t/> +<#if parameters.id??> + for="${parameters.id?html}" <#t/> +</#if> +<#if hasFieldErrors> + class="errorLabel"<#t/> +<#else> + class="label"<#t/> +</#if> + ><#t/> + + ${parameters.label?html} ${parameters.labelseparator!":"?html} +<#if parameters.required?default(false)> + <span class="required">*</span><#t/> +</#if> +<#include "/${parameters.templateDir}/xhtml/tooltip.ftl" /> + </label><#t/> +<#if parameters.labelposition?default("top") == 'top'> +</div> <#rt/> +<#else> +</span> <#rt/> +</#if> +</#if> Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<!DOCTYPE validators PUBLIC + "-//OpenSymphony Group//XWork Validator Config 1.0//EN" + "http://www.opensymphony.com/xwork/xwork-validator-config-1.0.dtd"> +<validators> +  + <validator name="int" class="com.opensymphony.xwork2.validator.validators.IntRangeFieldValidator"/> + <validator name="long" class="com.opensymphony.xwork2.validator.validators.LongRangeFieldValidator"/> + <validator name="short" class="com.opensymphony.xwork2.validator.validators.ShortRangeFieldValidator"/> + <validator name="double" class="com.opensymphony.xwork2.validator.validators.DoubleRangeFieldValidator"/> + <validator name="date" class="com.opensymphony.xwork2.validator.validators.DateRangeFieldValidator"/> + <validator name="expression" class="com.opensymphony.xwork2.validator.validators.ExpressionValidator"/> + <validator name="fieldexpression" class="com.opensymphony.xwork2.validator.validators.FieldExpressionValidator"/> + <validator name="conversion" class="com.opensymphony.xwork2.validator.validators.ConversionErrorFieldValidator"/> + <validator name="stringlength" class="com.opensymphony.xwork2.validator.validators.StringLengthFieldValidator"/> + <validator name="required" class="com.opensymphony.xwork2.validator.validators.RequiredFieldValidator"/> + <validator name="requiredstring" class="com.opensymphony.xwork2.validator.validators.RequiredStringValidator"/> + +  + <validator name="nfieldexpression" class="org.nuiton.validator.xwork2.field.NuitonFieldExpressionValidator"/> + <validator name="nrequired" class="org.nuiton.validator.xwork2.field.SkipableRequiredFieldValidator"/> + <validator name="nrequiredstring" class="org.nuiton.validator.xwork2.field.SkipableRequiredStringFieldValidator"/> + +  + +</validators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,272 @@ +<%@ page import="org.chorem.pollen.ui.actions.PollenActionSupport" %> +<%-- +#%L + Pollen :: UI (strust2) + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% +--%> +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8" %> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<%@ taglib prefix="d" uri="http://www.opensymphony.com/sitemesh/decorator" %> +<html xmlns="http://www.w3.org/1999/xhtml"> + +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> + <title>Pollen - <d:title default="Pollen"/></title> + <d:head/> + <%--<link rel="stylesheet" type="text/css" href="<s:url value='/css/pollen.css' />"/>--%> + <%--<link rel="stylesheet" type="text/css" href="<s:url value='/css/screen.css' />"/>--%> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/main.css' />"/> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/common.css' />"/> + <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />"/> + <sj:head jqueryui="true" jquerytheme="cupertino"/> +</head> + +<%-- TODO AThimel 24/01/2012 Remove this when refactoring is over --%> +<div id="in-progress"> + <a href="http://chorem.org/projects/pollen">Version βeta</a> +</div> + +<s:set var="user" value="%{#session.pollenSession.userAccount}"/> +<s:set var="userExists" value="%{#user != null}"/> +<s:set var="userIsAdmin" value="%{#userExists && #user.administrator}"/> + +<body id="${pageLogo}Body"> + + +<div id="po-header-localization" class="${pageLogo}Localization"> + <s:a title="Contacter un administrateur" + href="mailto:%{configuration.adminEmail}"> + <img src="<s:url value='/img/contact.png' />" alt="Contact"/> + </s:a> + | Date - Heure | + <s:a action="changeLang" id="localeFr"> + <s:param name="request_locale">fr_FR</s:param> + <img src="<s:url value='/img/fr.png' />" alt="Français"/> + </s:a> | <s:a action="changeLang" id="localeEn"> + <s:param name="request_locale">en_GB</s:param> + <img src="<s:url value='/img/en.png' />" alt="English"/> +</s:a> +</div> + + +<p id="po-header-logo"> + <s:a action="home" namespace="/"> + <img src="<s:url value='/img/pollen%{pageLogo}_%{safeLanguage}.png' />" + alt="Pollen"/> + </s:a> +</p> + +<div id="top" class="${pageLogo}"> + +  + <div id="po-header-connection" class="${pageLogo}"> + <s:if test="userExists"> + <span class="menu_elt" onmouseover="$('#compte_menu').show()" + onmouseout="$('#compte_menu').hide()"> + ${user.displayName} + <div class="dropdown_menu" id="compte_menu" style="display: none;"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <ul class="top_middle${pageLogo}"> + <li> + <s:a action="showUser" namespace="/user"> + <s:text name="pollen.menu.preferences"/> + </s:a> + </li> + <li> + <s:a action="logout" namespace="/user"> + <s:text name="pollen.menu.logout"/> + </s:a> + </li> + </ul> + </div> + </span> + </s:if> + <s:else> + <span onClick="$('#login_menu').toggle()"><s:text + name="pollen.menu.login"/></span> + + <div class="dropdown_menu" id="login_menu" style="display: none;"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <s:form id="connection" method="POST" namespace="/user" action="login"> + <ul class="top_middle${pageLogo}"> + <li> + <label for="connection_login"> + <s:text name="pollen.common.login"/> : + </label> + <s:textfield key="login" size="10" required="true" theme="simple"/> + </li> + <li> + <label for="connection_password"> + <s:text name="pollen.common.password"/> : + </label> + <s:password key="password" + label="%{getText('pollen.common.password')}" size="10" + required="true" theme="simple"/> + </li> + <li> + <s:submit id="submitform" action="login" key="pollen.action.login" + align="right"/> + </li> + </ul> + </s:form> + </div> + <s:text name="pollen.common.or"/> + <s:a action="registerUser" method="input" namespace="/user"> + <s:text name="pollen.menu.register"/> + </s:a> + </s:else> + + </div> + +  + <ul id="menu"> + <li class="menu_elt"> + <s:a action="home"> + <s:text name="pollen.menu.home"/> + </s:a> + </li> + <li class="menu_elt" onmouseout="$('#menu1').hide()" + onmouseover="$('#menu1').show()"> + <a><s:text name="pollen.menu.polls"/></a> + + <div class="dropdown_menu" id="menu1" style="display:none"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <ul class="top_middle${pageLogo}"> + <li> + <s:a action="createPoll" method="input" namespace="/poll"> + <s:text name="pollen.menu.createPoll"/> + </s:a> + </li> + <s:if test="userExists"> + <li> + <s:a action="displayCreatedPolls" method="input" namespace="/poll"> + <s:text name="pollen.menu.displayCreatedPolls"/> + </s:a> + </li> + <li> + <s:a action="displayParticipatedPolls" method="input" namespace="/poll"> + <s:text name="pollen.menu.displayParticipatedPolls"/> + </s:a> + </li> + <li> + <s:a action="displayVotingLists" method="input" namespace="/user"> + <s:text name="pollen.menu.displayVotingLists"/> + </s:a> + </li> + </s:if> + </ul> + </div> + </li> + <s:if test="userExists"> + <s:if test="userIsAdmin"> + <li class="menu_elt" onmouseout="$('#menu2').hide()" + onmouseover="$('#menu2').show()"> + <a><s:text name="pollen.menu.admin"/></a> + + <div class="dropdown_menu" id="menu2" style="display:none"> + <div class="top_right${pageLogo}"></div> + <div class="top_left${pageLogo}"></div> + <ul class="top_middle${pageLogo}"> + <li> + <s:a action="pollsList" namespace="/admin"> + <s:text name="pollen.menu.managePolls"/> + </s:a> + </li> + <li> + <s:a action="usersList" namespace="/admin"> + <s:text name="pollen.menu.manageUsers"/> + </s:a> + </li> + </ul> + </div> + </li> + </s:if> + </s:if> + </ul> +</div> + + +<%--<div id="corps" class="cleanBoth clearfix">--%> +<div id="corps"> + +  + <div id="po-header-addressBar" class="${pageLogo}Address"> + <%--<t:loop t:source="addressBar.items" t:value="item">--%> + <%-->--%> + <%--<strong>--%> + <%--<t:if test="item.address">--%> + <%--<a t:type="pagelink" t:page="prop:item.address" href="index">${item.name}</a>--%> + <%--<p:else>--%> + <%--${item.name}--%> + <%--</p:else>--%> + <%--</t:if>--%> + <%--</strong>--%> + <%--</t:loop>--%> + </div> + +  + <div id="${pageBodyId}" class="content"> + <noscript> + <%--<div t:type="nuiton/feedback" t:id="errorJs" />--%> + </noscript> + <%--<div t:type="nuiton/feedback" t:id="borderFeedback" t:autoClear="false"/>--%> + + <s:if test="hasActionMessages()"> + <div class="fb-info"> + <s:actionmessage/> + </div> + </s:if> + + <s:if test="hasActionErrors()"> + <div class="fb-error"> + <s:actionerror/> + </div> + </s:if> + <d:body/> + </div> +</div> + + +<div id="po-footer" class="${pageLogo}" xml:space="preserve"> + <a href="http://maven-site.chorem.org/pollen">Pollen</a> + <a href="http://www.chorem.org/projects/pollen/files"> + <%=PollenActionSupport.getApplicationVersion()%> + </a> - + <a href="http://www.gnu.org/licenses/gpl.html"> + <s:text name="pollen.common.license"/> + </a> - + <span title="Copyright">©2009-${currentYear}</span> + <a href="http://www.codelutin.com">Code Lutin</a> - + <a href="http://www.chorem.org/projects/pollen/issues"> + <s:text name="pollen.common.bugReport"/> + </a> - + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users"> + <s:text name="pollen.common.userSupport"/> + </a> +</div> + +</body> +</html> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,37 @@ + +<decorators defaultdir="/WEB-INF/decorators"> + + <excludes> + <pattern>/css/*</pattern> + <pattern>/js/*</pattern> + <pattern>/images/*</pattern> + <pattern>/config-browser/*</pattern> + </excludes> + + <decorator name="layout-default" page="layout-default.jsp"> + <pattern>/*</pattern> + </decorator> + +</decorators> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,61 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + +<title><s:text name="pollen.title.pollsList"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.pollsList"/></h1> + +<s:url id="loadUrl" action="getPolls" namespace="/json" escapeAmp="false"/> + +<%--script type="text/javascript"> + + jQuery(document).ready(function () { + $.addRowSelectTopic('users'); + $.addClearSelectTopic('users'); + $.addAddRowTopic('users', '${addUrl}'); + $.addSingleRowTopic('users', 'Update', '${editUrl}', 'user.id'); + $.addSingleRowTopic('users', 'Delete', '${delUrl}', 'user.id'); + }); +</script--%> + +<sjg:grid id="users" dataType="json" href="%{loadUrl}" gridModel="users" + pager="true" pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='users-rowSelect' editinline="true" editurl="%{loadUrl}" + onCompleteTopics='users-cleanSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10"> + <sjg:gridColumn name="id" title="id" hidden="true"/> + <sjg:gridColumn name="login" title='%{getText("pollen.common.login")}' sortable="false" editable="true"/> + <sjg:gridColumn name="firstName" title='%{getText("pollen.common.firstName")}' sortable="false" editable="true"/> + <sjg:gridColumn name="lastName" title='%{getText("pollen.common.lastName")}' sortable="false" editable="true"/> + <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}' sortable="false" editable="true"/> + <sjg:gridColumn name="admin" title='%{getText("pollen.common.admin")}' sortable="false" width="100" formatter="checkbox" editable="true" edittype="checkbox"/> +</sjg:grid> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,194 @@ +<%-- +#%L + EchoBase :: UI + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2011 Ifremer, Codelutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should 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 contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<script type="text/javascript" + src="<s:url value='/js/gridHelper.js' />"></script> + +<title><s:text name="pollen.title.usersList"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.usersList"/></h1> + +<s:url id="loadUSers" action="getUsers" namespace="/json" escapeAmp="false"/> + +<s:url id="loadUser" action="getUser" namespace="/json"/> + +<script type="text/javascript"> + + jQuery(document).ready(function () { + if ('${action}' == 'create') { + $('#createForm').show(); + } + if ('${action}' == 'update') { + $('#editForm').show(); + } + if ('${action}' == 'delete') { + $('#deleteForm').show(); + } + + // listen row selection + $.addRowSelectTopic('users'); + + // to edit a selected row + $.listenRowTopic('users-editRow', function (event) { + if(!jQuery.struts2_jquery['users']) { + return; + } + var id = jQuery.struts2_jquery['users']['selectedRow']; + jQuery.getJSON("${loadUser}", { "userId":id }, function (result) { + + var user = result.user; + $('#editForm [name="user.topiaId"]').val(user.id); + $('#editForm [name="user.login"]').val(user.login); + $('#editForm [name="user.email"]').val(user.email); + $('#editForm [name="user.firstName"]').val(user.firstName); + $('#editForm [name="user.lastName"]').val(user.lastName); + $('#editForm [name="user.administrator"]').prop('checked',false); + $('#editForm [name="user.administrator"]').prop('checked',user.administrator); + $('#editForm').show(); + $('#createForm').hide(); + $('#deleteForm').hide(); + } + ); + }); + + // to create a new row + $.listenRowTopic('users-addRow', function(event) { + $('#createForm [name="user.login"]').val(""); + $('#createForm [name="user.email"]').val(""); + $('#createForm [name="user.firstName"]').val(""); + $('#createForm [name="user.lastName"]').val(""); + $('#createForm [name="user.administrator"]').prop('checked',false); + $('#editForm').hide(); + $('#deleteForm').hide(); + $('#createForm').show(); + }); + + // to delete the selected row + $.listenRowTopic('users-deleteRow', function(event) { + if(!jQuery.struts2_jquery['users']) { + return; + } + var id = jQuery.struts2_jquery['users']['selectedRow']; + jQuery.getJSON("${loadUser}", { "userId":id }, function (result) { + + var user = result.user; + $('#deleteForm [name="user.topiaId"]').val(user.id); + $('#deleteForm [name="user.login"]').val(user.login); + $('#deleteForm [name="user.email"]').val(user.email); + $('#deleteForm [name="user.firstName"]').val(user.firstName); + $('#deleteForm [name="user.lastName"]').val(user.lastName); + $('#deleteForm [name="user.administrator"]').prop('checked',false); + $('#deleteForm [name="user.administrator"]').prop('checked',user.administrator); + $('#editForm').hide(); + $('#createForm').hide(); + $('#deleteForm').show(); + } + ); + }); + }); +</script> + +<sjg:grid id="users" dataType="json" href="%{loadUSers}" gridModel="users" + pager="true" pagerButtons="true" pagerInput="true" + navigator="true" rownumbers="false" autowidth="true" + onSelectRowTopics='users-rowSelect' editinline="false" + onCompleteTopics='users-cleanSelect' + navigatorEdit="false" navigatorDelete="false" + navigatorSearch="false" navigatorRefresh="false" + navigatorAdd="false" viewrecords="true" + rowList="10,15,20,50,100" rowNum="10" + navigatorExtraButtons="{ + add: { title: '%{getText(\"pollen.action.createUser\")}', icon: 'ui-icon-plus', topic: 'users-addRow' }, + edit: { title: '%{getText(\"pollen.action.editUser\")}', icon: 'ui-icon-pencil', topic: 'users-editRow' }, + delete:{ title: '%{getText(\"pollen.action.deleteUser\")}', icon: 'ui-icon-trash', topic: 'users-deleteRow' }}"> + + <sjg:gridColumn name="id" title="id" hidden="true"/> + <sjg:gridColumn name="login" title='%{getText("pollen.common.login")}' + sortable="false"/> + <sjg:gridColumn name="firstName" title='%{getText("pollen.common.firstName")}' + sortable="false"/> + <sjg:gridColumn name="lastName" title='%{getText("pollen.common.lastName")}' + sortable="false"/> + <sjg:gridColumn name="email" title='%{getText("pollen.common.email")}' + sortable="false"/> + <sjg:gridColumn name="administrator" title='%{getText("pollen.common.administrator")}' + sortable="false" width="100" formatter="checkbox" + editable="true" /> +</sjg:grid> + +<br/> + +<s:form id='editForm' method="POST" namespace="/admin" cssClass="hidden"> + + <s:hidden name="action" value="update"/> + <s:hidden key="user.topiaId" label=""/> + <%--<s:hidden key="user.login" label=""/>--%> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation.toUpdate"/></legend> + <s:textfield key="user.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> + <s:textfield key="user.email" label="%{getText('pollen.common.email')}" required="true" size="40"/> + <s:textfield key="user.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> + <s:textfield key="user.lastName" label="%{getText('pollen.common.lastName')}" size="40"/> + <s:checkbox key="user.administrator" label="%{getText('pollen.common.administrator')}"/> + </fieldset> + <br/> + <s:submit action="updateUser" key="pollen.action.validate" align="center"/> + +</s:form> + +<s:form id='createForm' method="POST" namespace="/admin" cssClass="hidden"> + + <s:hidden name="action" value="create"/> + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation.toCreate"/></legend> + <s:textfield key="user.login" label="%{getText('pollen.common.login')}" required="true" size="40"/> + <s:textfield key="user.email" label="%{getText('pollen.common.email')}" required="true" size="40"/> + <s:textfield key="user.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> + <s:textfield key="user.lastName" label="%{getText('pollen.common.lastName')}" size="40"/> + <s:checkbox key="user.administrator" label="%{getText('pollen.common.administrator')}"/> + </fieldset> + <br/> + <s:submit action="createUser" key="pollen.action.create" align="center"/> +</s:form> + +<s:form id='deleteForm' method="POST" namespace="/admin" cssClass="hidden"> + + <s:hidden name="action" value="delete"/> + <s:hidden key="user.topiaId" label=""/> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation.toDelete"/></legend> + <s:textfield key="user.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> + <s:textfield key="user.email" label="%{getText('pollen.common.email')}" required="true" readonly="true" size="40"/> + <s:textfield key="user.firstName" label="%{getText('pollen.common.firstName')}" readonly="true" size="40"/> + <s:textfield key="user.lastName" label="%{getText('pollen.common.lastName')}" readonly="true" size="40"/> + <s:checkbox key="user.administrator" label="%{getText('pollen.common.administrator')}" disabled="true"/> + </fieldset> + <br/> + <s:submit action="deleteUser" key="pollen.action.delete" align="center"/> +</s:form> + + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,32 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> + +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<br/> + +<div> + La page demandé n'est accessible que par un administrateur. +</div> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,43 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> + +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<br/> +<div class="center" style="margin-bottom:20px;"> + <img src="<s:url value='/img/pollen_%{safeLanguage}.png' />" alt="Pollen logo"/> +</div> + +<div class="center"> + <s:a action="createPoll" namespace="/poll"> + <img src="<s:url value='/img/smallCreation_%{safeLanguage}.png' />" alt="poll creation"/> + </s:a> + <s:a action="createForm" namespace="/poll"> + <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> + </s:a> + <s:a action="createForm" namespace="/poll"> + <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" alt="voteCounting"/> + </s:a> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,137 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<script type="text/javascript"> + + jQuery(document).ready(function () { + $('[name="poll.choiceAddAllowed"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#addChoiceAddAllowedPanel').show(); + } else { + $('#addChoiceAddAllowedPanel').hide(); + } + }); + + $('[name="limitChoice"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#maxChoiceNbPanel').show(); + } else { + $('#maxChoiceNbPanel').hide(); + } + }); + + $('[name="reminder"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#reminderPanel').show(); + } else { + $('#reminderPanel').hide(); + } + }); + + $('[name="notification"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#notificationPanel').show(); + } else { + $('#notificationPanel').hide(); + } + }); + + $('[name="poll.anonymous"]').change(function(event) { + var val = $(this).prop('checked'); + $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); + }); + $('[name="poll.continuousResults"]').change(function(event) { + var val = $(this).prop('checked'); + $('[name="poll.publicResults"]').prop('checked', val); + }); + }); +</script> +<title><s:text name="pollen.title.createPoll"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.createPoll"/></h1> + +<s:form method="POST" key="registerForm" namespace="/poll"> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.you"/></legend> + <s:textfield key="poll.creator.name" label="%{getText('pollen.common.login')}" required="true"/> + <s:textfield key="poll.creator.email" label="%{getText('pollen.common.email')}"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.general"/></legend> + + <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true"/> + <s:textfield key="poll.description" label="%{getText('pollen.common.description')}"/> + <sj:datepicker key="poll.beginDate" label="%{getText('pollen.common.beginDate')}" displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endDate" label="%{getText('pollen.common.endDate')}" displayFormat="dd/mm/yy"/> + <s:radio key='poll.type' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> + <s:radio key='poll.voteCounting' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.options"/></legend> + + <s:checkbox key="poll.anonymous" label="%{getText('pollen.common.pollOption.anonymous')}" /> + <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" /> + <s:checkbox key="poll.continuousResults" label="%{getText('pollen.common.pollOption.continuousResults')}" /> + <s:checkbox key="poll.publicResults" label="%{getText('pollen.common.pollOption.publicResults')}" /> + <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" /> + <div id='addChoiceAddAllowedPanel' class="hidden"> + <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endChoiceDate" label="%{getText('pollen.common.endChoiceDate')}" displayFormat="dd/mm/yy"/> + </div> + <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" /> + <div id='maxChoiceNbPanel' class="hidden"> + <s:textfield key="poll.maxChoiceNb" label="%{getText('pollen.common.pollOption.maxChoiceNb')}"/> + </div> + <s:checkbox key="notification" label="%{getText('pollen.common.pollOption.notification')}" /> + <div id='notificationPanel' class="hidden"> + <s:textfield key="notificationNumber" + label="%{getText('pollen.common.pollOption.notificationNumber')}" /> + </div> + <s:checkbox key="reminder" label="%{getText('pollen.common.pollOption.reminder')}" /> + <div id='reminderPanel' class="hidden"> + <s:textfield key="reminderHourCountdown" + label="%{getText('pollen.common.pollOption.reminderHourCountdown')}" /> + </div> + + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.choices"/></legend> + <s:select key="poll.choiceType" label='%{getText("poll.common.select.choiceType")}' + list="choiceTypes" headerKey="" headerValue=""/> + + </fieldset> + + <br/> + <s:submit action="createPoll" key="pollen.action.createPoll" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,69 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> + +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<div> + <strong> + <s:text name="pollen.information.need.login"/> + </strong> +</div> + +<br/> + +<s:form id="connection" action="login" method="POST" namespace="/user"> + +<fieldset> + <legend><s:text name="pollen.fieldset.login"/></legend> + + <s:textfield key="login" size="10" label="%{getText('pollen.common.login')}" + required="true"/> + <s:password key="password" + label="%{getText('pollen.common.password')}" size="10" + required="true"/> + + +</fieldset> + <br/> + <s:submit id="submitform" action="login" key="pollen.action.login" + align="center"/> + </s:form> +<div class="center" style="margin-bottom:20px;"> + <img src="<s:url value='/img/pollen_%{safeLanguage}.png' />" + alt="Pollen logo"/> +</div> +<div class="center"> + <s:a action="createForm"> + <img src="<s:url value='/img/smallCreation_%{safeLanguage}.png' />" + alt="poll creation"/> + </s:a> + <s:a action="createForm"> + <img src="<s:url value='/img/smallVote_%{safeLanguage}.png' />" alt="vote"/> + </s:a> + <s:a action="createForm"> + <img src="<s:url value='/img/smallVoteCounting_%{safeLanguage}.png' />" + alt="voteCounting"/> + </s:a> +</div> \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,50 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="pollen.title.register"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.register"/></h1> + +<s:form method="POST" key="registerForm"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:textfield name="user.login" key="pollen.common.login" required="true"/> + <s:password name="user.password" key="pollen.common.password" required="true"/> + <s:password name="password2" key="pollen.common.password2" required="true"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:textfield name="user.email" key="pollen.common.email" required="true"/> + <s:textfield name="user.firstName" key="pollen.common.firstName"/> + <s:textfield name="user.lastName" key="pollen.common.lastName"/> + </fieldset> + <br/> + <s:submit action="registerUser" key="pollen.action.register" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/registerUser.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,50 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="pollen.title.myAccount"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> + +<s:form method="POST"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:hidden key="user.topiaId" label="" /> + <s:label name="user.login" key="pollen.common.login"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:label name="user.email" key="pollen.common.email" /> + <s:label name="user.firstName" key="pollen.common.firstName" /> + <s:label name="user.lastName" key="pollen.common.lastName" /> + </fieldset> + <br/> + <s:submit action="updateUser" method="input" + key="pollen.action.modify" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/showUser.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,53 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> + +<title><s:text name="pollen.title.myAccount"/></title> + +<h1 class="title${pageLogo}"><s:text name="pollen.title.myAccount"/></h1> + +<s:form method="POST"> + + <fieldset> + <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + + <s:hidden key="user.topiaId" label=""/> + <s:textfield name="user.login" key="pollen.common.login" required="true"/> + <s:password name="user.password" key="pollen.common.password" + required="true"/> + <s:password name="newPassword" key="pollen.common.newPassword"/> + <s:password name="newPassword2" key="pollen.common.newPassword2"/> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.userInformation"/></legend> + + <s:textfield name="user.email" key="pollen.common.email" required="true"/> + <s:textfield name="user.firstName" key="pollen.common.firstName"/> + <s:textfield name="user.lastName" key="pollen.common.lastName"/> + </fieldset> + <br/> + <s:submit action="updateUser" key="pollen.action.validate" align="center"/> +</s:form> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/updateUser.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app id="Pollen" 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>EchoBase</display-name> + + <filter> + <filter-name>topiaTransaction</filter-name> + <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-prepare</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + </filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + </filter-class> + </filter> + + <filter-mapping> + <filter-name>topiaTransaction</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-prepare</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <description>Init</description> + <listener-class>org.chorem.pollen.ui.PollenApplicationListener</listener-class> + </listener> + + <welcome-file-list> + <welcome-file>/</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>home</welcome-file> + </welcome-file-list> +</web-app> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,147 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +.fleft { + float: left; +} + +.fright { + float: right; +} + +.clearfix { + display:block; +} + +.clearfix:after { + content:"."; + display:block; + height:0; + clear:both; + visibility:hidden; +} + +.hidden { + display: none; +} + +.display { + display: block; +} + +.center { + text-align: center; +} + +.selected { + background-color: yellow; +} + +/* + * For struts +*/ + + + +/*.wwgrp {*/ + /*float: none;*/ +/*}*/ + +fieldset, hr , .cleanBoth{ + clear: both +} +.wwlbl { + float: left; + clear: both; + width: 300px; + /*# text-align: right;*/ +} +.wwctrl { + float: left; +} + + + +.wwerr { + clear: both; + float: left; +} + +.required { + color: #880000; + font-style: italic; +} + +div.errorMessage{ + clear: both; + float: left; +} + +.errorMessage { + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #000; + border-color: #f00; + margin-left:0px; +} + +.info_success { + background: no-repeat scroll 8px 5px #DFFFDF; + border: 2px solid #9FCF9F; + width: 800px; + margin-bottom: 5px; +} +.info_success ul{ + margin: 5px; + padding-left: 5px; +} +.info_success li{ + background: url("../img/true.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #005F00; + margin-left:0px; +} + +.info_error { + background: no-repeat scroll 8px 5px #FFE3E3; + border: 2px solid #DD0000; + width: 800px; + margin-bottom: 5px; +} +.info_error ul{ + margin: 5px; + padding-left: 5px; +} +.info_error li{ + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #880000; + margin-left:0px; +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,495 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +body { + background-color: #FFF; + background-repeat: no-repeat; + background-position: bottom right; + background-attachment: fixed; + border: none; + font-family: "Trebuchet MS", Arial, sans-serif; + font-size: small; + width: 1000px; + margin: auto; +} + +#CreationBody { + background-image: url("../img/bigCreation.png"); +} + +#VoteBody { + background-image: url("../img/bigVote.png"); +} + +#VoteCountingBody { + background-image: url("../img/bigVoteCounting.png"); +} + +body a { + color: #727a7e; +} + +body a img { + border: none; +} + +body ul { + list-style-type: none; + margin: 0px; + padding: 0px; +} + +/*Haut de page*/ +.CreationLocalization, .VoteLocalization, +.VoteCountingLocalization { + margin-top: 82px; +} + +.IndexLocalization { + margin-top: 10px; +} + +#po-header-localization { + text-align: right; + margin-bottom: 1px; +} + +#po-header-localization a { + text-decoration: none; +} + +#po-header-logo { + float: left; + margin-top: -102px; + margin-right: 10px; +} + +#po-header-connection { + float: right; + vertical-align: top; + position: relative; + margin-right: 10px; + text-align: right; +} + +#po-header-connection form { + margin: 0px; + padding: 0px; + width: 200px; +} + +#po-header-connection a, +#po-header-connection span { + padding: 1px; + padding-left: 5px; + padding-right: 5px; + text-decoration: none; + cursor: pointer; +} + +#po-header-connection a:hover, +#po-header-connection span:hover { + -moz-border-radius: 10px; + background-color: #000; + color: #fff; +} + +.Index { + background-color: #ff0; + color: #000; +} + +.Creation { + background-color: #32b5c9; + color: #000; +} + +.Vote { + background-color: #55cb00; + color: #000; +} + +.VoteCounting { + background-color: #ff1920; + color: #000; +} + +#top { + padding: 7px; + text-align: left; + vertical-align: middle; +} + +#top a { + color: #000; + text-decoration: none; +} + +#menu { + display: inline; +} + +#menu li { + cursor: pointer; +} + +#menu li a { + padding: 1px; + padding-left: 5px; + padding-right: 5px; +} + +#menu li a:hover { + -moz-border-radius: 10px; + background-color: #000; + color: #fff; +} + +.menu_elt { + display: inline; + margin-right: 40px; + position: relative; +} + +/** DROPDOWN MENU **/ +.dropdown_menu { + padding-top: 9px; + position: absolute; + z-index: 20; +} + +.dropdown_menu .top_leftIndex { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuIndex.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightIndex { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuIndex.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleIndex { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #ff0; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu .top_leftCreation { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuCreation.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightCreation { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuCreation.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleCreation { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #32b5c9; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu .top_leftVote { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuVote.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightVote { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuVote.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleVote { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #55cb00; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu .top_leftVoteCounting { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topleft_menuVoteCounting.png"); + background-repeat: no-repeat; + background-position: left; + float: left; +} + +.dropdown_menu .top_rightVoteCounting { + height: 16px; + width: 16px; + border: none; + background-image: url("../img/topright_menuVoteCounting.png"); + background-repeat: no-repeat; + background-position: right; + float: right; +} + +.dropdown_menu .top_middleVoteCounting { + margin: 15px; + margin-bottom: 0px; + margin-top: 0px; + background-color: #ff1920; + border-top: none; + -moz-border-radius-bottomright: 15px; + -moz-border-radius-bottomleft: 15px; + padding: 10px; + padding-top: 0px; + min-width: 140px; +} + +.dropdown_menu li { + z-index: 25; + padding: 3px; + display: block; + letter-spacing: 0px; +} + +#menu1 { + top: 12px; + left: -45px; +} + +#menu2 { + top: 12px; + left: -45px; +} + +#login_menu { + top: 12px; + right: -10px; +} + +#compte_menu { + top: 12px; + right: -25px; +} + +HTML>BODY DIV.t-error LI { + margin-left: 10px; +} + +/* Le corps de la page */ +#corps { + text-align: justify; + color: #000; + border: none; + min-height: 300px; +} + +#corps h1,h2,h3,h4 { + text-align: center; +} + +#corps .titleIndex { + color: #fc0; + font-weight: bold; +} + +/* TODO : refactor titleCreation usage by titlePoll */ +#corps .titlePoll, +#corps .titleCreation { + color: #32b5c9; + font-weight: bold; +} + +#corps .titleVote { + color: #55cb00; + font-weight: bold; +} + +#corps .titleVoteCounting { + color: #ff1920; + font-weight: bold; +} + +#corps h2 { + color: #727a7e; +} + +#po-header-addressBar { + padding: 5px; + margin-left: 350px; +} + +.IndexAddress { + background-color: #ffffaa; +} + +.CreationAddress { + background-color: #98dae4; +} + +.VoteAddress { + background-color: #b0f580; +} + +.VoteCountingAddress { + background-color: #ff8c8f; +} + +.content { + padding: 15px; +} + +/* Pied de page */ +#po-footer { + padding: 5px; + font-size: small; + text-align: center; + margin-top: 20px; +} + +#po-footer a, +#po-footer span { + color:#727a7e; +} + +/** old LoginComponent > Connexion page **/ +#loginCompForm fieldset { + border: 1px solid #aab; + padding: 15px; + padding-bottom: 10px; + width: 280px; + margin: auto; + margin-top: 20px; + vertical-align: top; + text-align: left; +} + +#loginCompForm div { + margin-bottom: 10px; +} + +#loginCompForm label { + display: block; + width: 100px; + float: left; +} + +#loginCompForm .buttons { + text-align: center; + margin-top: 20px; + padding-left: 0px; +} + +.fb-error { + width: 400px; + margin: auto; + text-align: center; + color: #000; + font-weight: bold; + padding: 3px; + border: solid; + border-color: #f00; + border-width: 2px; +} + +.fb-info { + width: 400px; + margin: auto; + text-align: center; + color: #000; + padding: 3px; + border: solid; + border-color: #000; + border-width: 2px; +} + + + +#in-progress { + -moz-transform: rotate(-45deg); + -webkit-transform:rotate(-45deg); + background-color: #00cc00; + box-shadow: 0 0 1em #888888; + left: -4em; + overflow: hidden; + position: fixed; + top: 2.5em; + width: 200px; + z-index: 999; +} +#in-progress a { + border: 1px solid #FFAAAA; + color: #FFFFFF; + display: block; + font-size: 1.1em; + font-weight: bold; + padding: 0.5em; + text-align: center; + text-decoration: none; + text-shadow: 1px 1px 10px #000000; +} \ No newline at end of file Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,162 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +/** {*/ + /*font-family: sans-serif;*/ +/*}*/ + +.inline { + display:inline; +} + +.fontsize11 { + font-size: 11px; +} + +.ui-tabs-panel { + font-family: monospace; + font-size: 9pt; +} + +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em .1em; + text-decoration: none; + font-size: 11px; +} + +.clearBoth { + clear: both; +} + +.hidden { + display:none; +} + +.displayBlock { + display:block; +} + +.floatLeft { + float:left; +} + +.floatRight { + float:right; +} + +.info_success { + background: no-repeat scroll 8px 5px #DFFFDF; + border: 2px solid #9FCF9F; + width: 800px; + margin-bottom: 5px; +} +.info_success ul{ + margin: 5px; + padding-left: 5px; +} +.info_success li{ + background: url("../images/true.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #005F00; + margin-left:0px; +} + +.info_error { + background: no-repeat scroll 8px 5px #FFE3E3; + border: 2px solid #DD0000; + width: 800px; + margin-bottom: 5px; +} +.info_error ul{ + margin: 5px; + padding-left: 5px; +} +.info_error li{ + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #880000; + margin-left:0px; +} + +.errorMessage li{ + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #880000; + margin-left:0px; +} + +.verticalAlignTop { + vertical-align: top; +} + +fieldset, hr , .cleanBoth{ + clear: both +} +.wwlbl { + float: left; + clear: both; + width: 300px; +/*# text-align: right;*/ +} +.wwctrl { + float: left; +} + +.wwerr { + clear: both; + float: left; +} + +div.errorMessage{ + clear: both; + float: left; +} +.errorMessage { + background: url("../img/exclamation.png") no-repeat ; + list-style: none; + font-style: italic; + padding-left: 25px; + color: #880000; + margin-left:0px; +} + +.required { + color: #880000; + font-style: italic; +} + +.clearfix { + display: inline-block; +} + +/* Hide from IE Mac \*/ +.clearfix { + display: block; +} Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/favicon.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/favicon.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1downarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1downarrow.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1leftarrow.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1rightarrow.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1uparrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/1uparrow.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2leftarrow.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/2rightarrow.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/7ter.jpg =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/7ter.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigCreation.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVote.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/bigVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/close.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/close.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/contact.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/contact.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/copy.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/copy.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/count.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/count.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/delete.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/delete.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/edit.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/edit.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/editSmall.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/editSmall.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/exclamation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/exclamation.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/export.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/export.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed2.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/feed2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/gplv3.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/gplv3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/help.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/help.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/import.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/import.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/lutin.gif =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/lutin.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenCreation_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenIndex_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVoteCounting_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollenVote_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/pollen_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/refresh-22px.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep1.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep1.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep2.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep2.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep3.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/rep3.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/save.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/save.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallCreation_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVoteCounting_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_en.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_en.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_fr.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/smallVote_fr.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menu.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuCreation.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuIndex.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVote.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topleft_menuVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menu.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menu.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuCreation.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuIndex.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVote.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/topright_menuVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/true.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/true.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/undo.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/undo.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/vote.png =================================================================== (Binary files differ) Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/img/vote.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,25 @@ +<%-- + #%L + Pollen :: UI (strust2) + + $Id$ + $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<% response.sendRedirect("home");%> Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js =================================================================== --- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,202 @@ +/* + * #%L + * Pollen :: UI (strust2) + * + * $Id$ + * $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-2.0-beta-1/pollen-ui-strut… $ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +( function ($) { + + $.fn.extend( + { + addRowSelectTopic:function (gridId, callback) { + $.subscribe(gridId + '-rowSelect', function (event) { + if (event.originalEvent) { + var gridId = event.data.id; + var opts = jQuery.struts2_jquery[gridId] = {}; + + var id = event.originalEvent.id; + if (id) { + opts['selectedRow'] = id; + } + } + var callback = event.data.callback; + if (callback) { + callback(event); + } + }, {id:gridId, callback:callback}); + }, + + addClearSelectTopic:function (gridId, callback) { + $.subscribe(gridId + '-clearSelect', function (event) { + var gridId = event.data.id; + jQuery.struts2_jquery[gridId] = {}; + var callback = event.data.callback; + if (callback) { + callback(event); + } + }, {id:gridId, callback:callback}); + }, + + listenRowTopic:function (topic, callback) { + $.subscribe(topic, function (event) { + var callback = event.data.callback; + if (callback) { + callback(event); + } + }, {callback:callback}); + }, + + addAddRowTopic:function (gridId, callback) { + $.subscribe(gridId + '-rowAdd', function (event) { + var callback = event.data.callback; + if (callback) { + callback(event); + } + }, {id:gridId, callback:callback}); + }, + + addDeleteRowTopic:function (gridId, callback) { + $.subscribe(gridId + '-rowDelete', function (event) { + var callback = event.data.callback; + if (callback) { + callback(event); + } + }, {id:gridId, callback:callback}); + }, + +// addAddRowTopic:function (gridId, url) { +// $.subscribe(gridId + '-rowAdd', function (event) { +// var url = event.data.url; +// window.location = url; +// }, {id:gridId, url:url}); +// }, + + addSingleRowTopic:function (gridId, action, url, parameterName) { + $.subscribe(gridId + '-row' + action, function (event) { + var gridId = event.data.id; + var opts = jQuery.struts2_jquery[gridId]; + if (opts && opts['selectedRow']) { + var selectedId = opts['selectedRow']; + var parameterName = event.data.parameterName; + var params = {} + params[parameterName] = selectedId; + var url = $.prepareUrl(event.data.url, params); + window.location = url; + } + }, {id:gridId, url:url, parameterName:parameterName}); + }, + addMultiRowTopic:function (gridId, action, target, checkboxName, callback) { + $.subscribe(gridId + '-row' + action, function (event) { + var gridId = event.data.id; + var prefix = 'jqg_' + gridId + '_'; + var prefixLength = prefix.length; + + // get all selected ids + var inputs = $('table#' + gridId + ' :checked[id^="' + prefix + '"]'); + + if (inputs && inputs.length) { + var checkboxName = event.data.checkboxName; + inputs.each(function () { + var id = this.id; + var newId = id.substring(prefixLength); + $.attr(this, "name", checkboxName); + $.attr(this, "value", newId); + $.attr(this, "checked", "checked"); + }); + var callback = event.data.callback; + if (callback) { + callback(); + } + event.data.target.click(); + } + }, {id:gridId, + target:target, + checkboxName:checkboxName, + callback:callback}); + }, + + serializeCheckboxs:function (id, params, newId) { + var all = $(':checkbox[name="' + id + '"]'); + var selected = $(':checked[name="' + id + '"]'); + + if (all.length != selected.length) { + + // apply a year filter + var list = []; + selected.each(function () { + list.push(this.value); + }); + if (!newId) { + newId = id; + } + params[newId] = list; + } + }, + + prepareUrl:function (url, params) { + var result = url; + if (url.indexOf("?") > -1) { + result += "&"; + } else { + result += "?"; + } + result += $.param(params); + return result; + } + }); + + $.extend({ + addRowSelectTopic:function (gridId, callback) { + return $(document).addRowSelectTopic(gridId, callback); + }, + + addClearSelectTopic:function (gridId, callback) { + return $(document).addClearSelectTopic(gridId, callback); + }, + + addAddRowTopic:function (gridId, callback) { + return $(document).addAddRowTopic(gridId, callback); + }, + + listenRowTopic:function (topic, callback) { + return $(document).listenRowTopic(topic, callback); + }, + + addDeleteRowTopic:function (gridId, callback) { + return $(document).addDeleteRowTopic(gridId, callback); + }, + + addSingleRowTopic:function (gridId, action, url, parameterName) { + return $(document).addSingleRowTopic(gridId, action, url, parameterName); + }, + + addMultiRowTopic:function (gridId, action, target, checkboxName, calbback) { + return $(document).addMultiRowTopic(gridId, action, target, checkboxName, calbback); + }, + serializeCheckboxs:function (id, params, newId) { + return $(document).serializeCheckboxs(id, params, newId); + }, + prepareUrl:function (url, params) { + return $(document).prepareUrl(url, params); + } + }); +})(jQuery); + Property changes on: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/LICENSE.txt =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/LICENSE.txt 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/LICENSE.txt 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,45 +24,35 @@ want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,40 +633,29 @@ Copyright (C) <year> <name of author> This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by + it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,49 +1,37 @@ <?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> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-SNAPSHOT</version> + </parent> - <parent> - <groupId>org.chorem</groupId> - <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> - </parent> - - <groupId>org.chorem.pollen</groupId> - <artifactId>pollen-votecounting</artifactId> + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting</artifactId> - <dependencies> + <name>Pollen :: Vote Counting</name> + <description>Service de dépouillement</description> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependencies> - </dependencies> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> -  -  -  + </dependencies> - <name>Pollen :: Vote Counting</name> - <description>Service de dépouillement</description> - -  -  -  - - <packaging>jar</packaging> - </project> Added: branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/THIRD-PARTY.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/THIRD-PARTY.properties (rev 0) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD style +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Public License Version 1.0 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jan 30 01:22:54 CET 2012 +org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/ChoiceType.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,21 +1,28 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.common; public enum ChoiceType { - TEXT, DATE, IMAGE; -} + TEXT, DATE, IMAGE +} \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/PollType.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,21 +1,28 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.common; public enum PollType { - FREE, RESTRICTED, GROUP; -} + FREE, RESTRICTED, GROUP +} \ No newline at end of file Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,21 +1,28 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.common; public enum VoteCountingType { - NORMAL, PERCENTAGE, CONDORCET, NUMBER; + NORMAL, PERCENTAGE, CONDORCET, NUMBER } Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Choice.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Context.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Group.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Method.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/NumberMethod.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.votecounting.business; import java.util.List; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/PercentageMethod.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/Vote.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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; /** Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/package-info.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /** * Gestion des dépouillements. */ Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/ChoiceDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,18 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ + * + * You should 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.dto; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/CommentDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; /** Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollChoiceDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; /** Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; import java.util.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollExportDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; import java.util.List; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; import java.util.List; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteToChoiceDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; /** Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingGroupDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; import java.util.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VotingPersonDTO.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.dto; import java.util.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/package-info.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /** * Data Transfert Objects. */ Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExport.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import java.io.File; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import java.io.File; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCounting.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import org.chorem.pollen.votecounting.dto.PollDTO; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import java.util.List; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/package-info.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /** * Services proposés par le module VoteCounting. */ Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/ListBehavior.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.utils; import java.util.List; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/PercentageBehavior.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.utils; /** Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/Utils.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.utils; import java.util.List; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/utils/package-info.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ /** * Classes utilitaires. */ Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/log4j.properties =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/log4j.properties 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/main/resources/log4j.properties 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Vote Counting +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreator.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import org.chorem.pollen.votecounting.dto.PollDTO; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/PollDTOCreatorVoteCounting.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import java.util.ArrayList; Modified: branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java =================================================================== --- branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pollen-votecounting/src/test/java/org/chorem/pollen/votecounting/business/services/ServiceVoteCountingImplTest.java 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,19 +1,26 @@ -/* *##% Pollen - * Copyright (C) 2009 CodeLutin - * +/* + * #%L + * Pollen :: Vote Counting + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by + * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. ##%*/ - + * + * You should 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.services; import org.apache.commons.logging.Log; Modified: branches/pollen-1.2.6-struts2/pom.xml =================================================================== --- branches/pollen-1.2.6-struts2/pom.xml 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/pom.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,439 +1,776 @@ <?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.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>3.0.7</version> + </parent> + + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.2.6-SNAPSHOT</version> + + <modules> + <module>pollen-votecounting</module> + <module>pollen-persistence</module> + <module>pollen-services</module> + <module>pollen-ui-struts2</module> +  +  + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.6.9.Final</version> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>11.0.1</version> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4.4</version> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.0.6</version> - </parent> + <artifactId>nuiton-utils</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <groupId>org.chorem</groupId> - <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> - <modules> - <module>pollen-ui</module> - <module>pollen-business</module> - <module>pollen-votecounting</module> - </modules> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-struts2</artifactId> + <version>${nuitonWebVersion}</version> + <scope>compile</scope> + </dependency> - <dependencyManagement> - <dependencies> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web</artifactId> + <version>${nuitonWebVersion}</version> + <scope>compile</scope> + </dependency> - <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>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>${tapestry.version}</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.5.8</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-upload</artifactId> - <version>${tapestry.version}</version> - </dependency> - <dependency> - <groupId>org.chenillekit</groupId> - <artifactId>chenillekit-tapestry</artifactId> - <version>1.0.0</version> - <exclusions> - <exclusion> - <groupId>jboss</groupId> - <artifactId>javassist</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>jfree</groupId> - <artifactId>jfreechart</artifactId> - <version>1.0.12</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> - </dependency> - <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - <version>2.0.1</version> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.2.131</version> - </dependency> - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jvnet.hudson.winstone</groupId> - <artifactId>winstone</artifactId> - <version>0.9.10-hudson-16</version> - </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-tapestry</artifactId> + <version>${nuitonWebVersion}</version> + </dependency> -  -  -  + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${nuitonI18nVersion}</version> + </dependency> - <name>Pollen</name> - <description>Application de vote Pollen</description> - <inceptionYear>2009</inceptionYear> - <url>http://maven-site.chorem.org/pollen/</url> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> - <licenses> - <license> - <name>General Public License (GPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topiaVersion}</version> + </dependency> -  - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>florian.desbois(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>enema</id> - <name>Erwan NEMA</name> - <email>nemawan(a)hotmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Chef de Projet</role> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>kmorin</id> - <name>Kevin MORIN</name> - <email>km(a)kevinmorin.net</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Architecte</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tpoulit</id> - <name>Thierry POULIT-POUBLAT</name> - <email>tpoulit(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>aboukhary</id> - <name>Abdelmajid BOUKHARY</name> - <email>benouna66(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tcicognagni</id> - <name>Thomas CICOGNANI</name> - <email>zhykos(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Architecte</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>aeddahbi</id> - <name>Amine EDDAHBI</name> - <email>eddahbi(a)gmail.com</email> - <organization>ALMA - Code Lutin</organization> - <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Architecte</role> - <role>Développeur</role> - </roles> - </developer> - <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> - <roles> - <role>Concepteur</role> - <role>Développeur</role> - </roles> - </developer> - <developer> - <id>tchemit</id> - <name>Tony Chemit</name> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>${tapestryVersion}</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry5-annotations</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-ioc</artifactId> + <version>${tapestryVersion}</version> + </dependency> -  -  -  + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>${slf4jVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <version>${slf4jVersion}</version> + <scope>runtime</scope> + </dependency> - <packaging>pom</packaging> +  + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-upload</artifactId> + <version>${tapestryVersion}</version> + </dependency> + <dependency> + <groupId>org.chenillekit</groupId> + <artifactId>chenillekit-tapestry</artifactId> + <version>1.0.0</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>javassist</artifactId> + </exclusion> + </exclusions> + </dependency> - <properties> +  -  - <platform>chorem.org</platform> - <projectId>pollen</projectId> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> -  -  - <topia.version>2.2.2</topia.version> - <eugene.version>1.0.1</eugene.version> - <tapestry.version>5.1.0.5</tapestry.version> - <nuiton-utils.version>1.1.2</nuiton-utils.version> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> -  - <siteLocales>en,fr</siteLocales> + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-grid-plugin</artifactId> + <version>${jqueryPluginVersion}</version> + </dependency> -  - <license.licenseName>gpl_v3</license.licenseName> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - </properties> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> - <build> + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + </exclusions> + </dependency> - <pluginManagement> - <plugins> + <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.14</version> + </dependency> + <dependency> + <groupId>org.jfree</groupId> + <artifactId>jcommon</artifactId> + <version>1.0.17</version> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.10.0.GA</version> + </dependency> + <dependency> + <groupId>net.sf.opencsv</groupId> + <artifactId>opencsv</artifactId> + <version>2.3</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>1.0</version> + </dependency> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>${postgresqlVersion}</version> + </dependency> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>7.0.1.v20091125</version> - </plugin> +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>${h2Version}</version> + </dependency> - </plugins> - </pluginManagement> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-runner</artifactId> + <version>${jettyVersion}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.jvnet.hudson.winstone</groupId> + <artifactId>winstone</artifactId> + <version>0.9.10-hudson-24</version> + </dependency> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - </resource> - </resources> - </build> -  -  -  + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.12</version> + </dependency> - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.5-1.2.x</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.5-1.2.x</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/branches/pollen-1.2.5-1.2.x</url> - </scm> +  + </dependencies> + </dependencyManagement> - <repositories> +  +  +  -  -  + <name>Pollen</name> + <description>Application de vote Pollen</description> + <inceptionYear>2009</inceptionYear> + <url>http://maven-site.chorem.org/pollen/</url> -  -  + <licenses> + <license> + <name>GNU Affero General Public License version 3</name> + <url>http://www.gnu.org/licenses/agpl.html</url> + <distribution>repo</distribution> + </license> + </licenses> -  +  + <developers> + <developer> + <id>fdesbois</id> + <name>Florian DESBOIS</name> + <email>florian.desbois(a)gmail.com</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>enema</id> + <name>Erwan NEMA</name> + <email>nemawan(a)hotmail.com</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Chef de Projet</role> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>kmorin</id> + <name>Kevin MORIN</name> + <email>km(a)kevinmorin.net</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Architecte</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tpoulit</id> + <name>Thierry POULIT-POUBLAT</name> + <email>tpoulit(a)gmail.com</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>aboukhary</id> + <name>Abdelmajid BOUKHARY</name> + <email>benouna66(a)gmail.com</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Analyste</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tcicognagni</id> + <name>Thomas CICOGNANI</name> + <email>zhykos(a)gmail.com</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Architecte</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>aeddahbi</id> + <name>Amine EDDAHBI</name> + <email>eddahbi(a)gmail.com</email> + <organization>ALMA - Code Lutin</organization> + <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Architecte</role> + <role>Développeur</role> + </roles> + </developer> + <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> + <roles> + <role>Concepteur</role> + <role>Développeur</role> + </roles> + </developer> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> +  +  +  -  + <packaging>pom</packaging> - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> + <properties> - <pluginRepositories> +  + <platform>chorem.org</platform> + <projectId>pollen</projectId> -  +  + <topiaVersion>2.6.4</topiaVersion> + <eugenePluginVersion>2.4.1</eugenePluginVersion> + <nuitonI18nVersion>2.4.1</nuitonI18nVersion> + <tapestryVersion>5.1.0.5</tapestryVersion> + <nuitonWebVersion>1.9.1</nuitonWebVersion> <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> + <h2Version>1.3.163</h2Version> + <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <struts2Version>2.3.1.2</struts2Version> + <jqueryPluginVersion>3.2.1</jqueryPluginVersion> + <slf4jVersion>1.6.4</slf4jVersion> - <pluginRepository> + <jettyVersion>8.1.0.RC5</jettyVersion> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> +  + <siteLocales>en,fr</siteLocales> -  +  + <license.licenseName>agpl_v3</license.licenseName> - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> + </properties> - </pluginRepositories> +  +  +  +  + +  +  +  +  +  +  + +  +  + +  +  + +  + + <build> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + +  + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugenePluginVersion}</version> + <configuration> + <inputs>zargo</inputs> + <resolver>org.nuiton.util.FasterCachedResourceResolver</resolver> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nVersion}</version> + </plugin> + +  + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>1.4</version> + </plugin> + +  + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <version>${jettyVersion}</version> + </plugin> + + </plugins> + </pluginManagement> + + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + </build> + +  +  +  + + <scm> + <connection> + scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 + </connection> + <developerConnection> + scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 + </developerConnection> + <url> + http://www.chorem.org/repositories/browse/pollen/branches/pollen-1.2.6-stru… + </url> + </scm> + + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}-1.2.6</url> + </site> + </distributionManagement> + + <repositories> + +  +  + +  +  + +  + + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + +  + + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + + </repositories> + + <pluginRepositories> + +  + + <pluginRepository> + + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> + +  + + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + + </pluginRepositories> + + <reporting> + +  + <excludeDefaults>true</excludeDefaults> + + </reporting> + </project> Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/analyse.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Analyse ======= Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/architecture.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Architecture de l'application Pollen ==================================== Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/assentiment.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/assentiment.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/assentiment.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Dépouillement par assentiment ----------------------------- Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/business.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - business ======== Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/condorcet.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/condorcet.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/condorcet.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Méthode de vote Condorcet ------------------------- Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/depouillement.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/depouillement.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/depouillement.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Les méthodes de dépouillement de Pollen --------------------------------------- Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/developer.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/developer.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/developer.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Documentation développeur ========================= Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/historique.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/historique.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/historique.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Pourquoi Pollen est Pollen ? ---------------------------- Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/index.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/index.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/index.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Bienvenue sur le site de Pollen =============================== Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/install.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Installation ============ Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/nombre.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/nombre.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/nombre.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Dépouillement par nombre ------------------------ Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/pourcentage.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/pourcentage.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/pourcentage.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Vote par pourcentage ou vote par estimation moyenne --------------------------------------------------- Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/tutoriel.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Tutoriel ======== Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/ui.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - UI == Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/user.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/user.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/user.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Documentation utilisateur ========================= Modified: branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/fr/rst/votecounting.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - VoteCounting ============ Modified: branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/analyse.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Analysis ======== Modified: branches/pollen-1.2.6-struts2/src/site/rst/approval.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/approval.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/approval.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Approval voting --------------- Modified: branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/architecture.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Pollen architecture =================== Modified: branches/pollen-1.2.6-struts2/src/site/rst/business.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/business.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/business.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Business ======== Modified: branches/pollen-1.2.6-struts2/src/site/rst/condorcet.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/condorcet.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/condorcet.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Condorcet method ---------------- Modified: branches/pollen-1.2.6-struts2/src/site/rst/developer.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/developer.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/developer.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Developer documentation ======================= Modified: branches/pollen-1.2.6-struts2/src/site/rst/historical.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/historical.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/historical.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Why Pollen is Pollen ? ---------------------- Modified: branches/pollen-1.2.6-struts2/src/site/rst/index.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/index.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/index.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Welcome to Pollen website ========================= Modified: branches/pollen-1.2.6-struts2/src/site/rst/install.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/install.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/install.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Installation guide ================== Modified: branches/pollen-1.2.6-struts2/src/site/rst/methods.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/methods.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/methods.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Pollen's votecounting methods ----------------------------- Modified: branches/pollen-1.2.6-struts2/src/site/rst/number.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/number.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/number.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Counting by numbers ------------------- Modified: branches/pollen-1.2.6-struts2/src/site/rst/percentage.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/percentage.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/percentage.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Vote by percentage ------------------ Modified: branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/tutoriel.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - Tutorial ======== Modified: branches/pollen-1.2.6-struts2/src/site/rst/ui.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/ui.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/ui.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - UI == Modified: branches/pollen-1.2.6-struts2/src/site/rst/user.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/user.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/user.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - User documentation ================== Modified: branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst =================================================================== --- branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/rst/votecounting.rst 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,3 +1,26 @@ +.. - +.. * #%L +.. * Pollen +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2012 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Affero General Public License as published by +.. * the Free Software Foundation, either version 3 of the License, or +.. * (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Public License for more details. +.. * +.. * You should have received a copy of the GNU Affero General Public License +.. * along with this program. If not, see <http://www.gnu.org/licenses/>. +.. * #L% +.. - VoteCounting ============ Modified: branches/pollen-1.2.6-struts2/src/site/site_en.xml =================================================================== --- branches/pollen-1.2.6-struts2/src/site/site_en.xml 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/site_en.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <publishDate format="dd/MM/yyyy"/> Modified: branches/pollen-1.2.6-struts2/src/site/site_fr.xml =================================================================== --- branches/pollen-1.2.6-struts2/src/site/site_fr.xml 2012-01-24 16:50:44 UTC (rev 3120) +++ branches/pollen-1.2.6-struts2/src/site/site_fr.xml 2012-01-30 01:14:44 UTC (rev 3121) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <publishDate format="dd/MM/yyyy"/>

1 0

r3120 - in branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n webapp/WEB-INF/jsp/poll
by tchemit＠users.chorem.org 24 Jan '12

24 Jan '12

Author: tchemit Date: 2012-01-24 17:50:44 +0100 (Tue, 24 Jan 2012) New Revision: 3120 Url: http://chorem.org/repositories/revision/pollen/3120 Log: add poll screen Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-24 16:49:31 UTC (rev 3119) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-24 16:50:44 UTC (rev 3120) @@ -23,49 +23,142 @@ */ package org.chorem.pollen.ui.actions.poll; +import com.google.common.collect.Maps; +import com.opensymphony.xwork2.Preparable; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; +import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.entity.Poll; +import org.chorem.pollen.entity.UserAccount; import org.chorem.pollen.services.PollService; import org.chorem.pollen.ui.actions.PollenActionSupport; -import org.nuiton.topia.TopiaException; +import java.util.Map; + /** * Creates a new poll. * * @author tchemit <chemit(a)codelutin.com> * @since 2.0 */ -public class CreatePoll extends PollenActionSupport { +public class CreatePoll extends PollenActionSupport implements Preparable { private static final long serialVersionUID = 1L; protected Poll poll; + protected Map<String, String> pollTypes; + + protected Map<String, String> voteCountingTypes; + + protected Map<String, String> choiceTypes; + + protected boolean notification; + + protected boolean reminder; + + protected boolean limitChoice; + + protected int reminderHourCountdown; + + protected int notificationNumber; + public String getPageLogo() { return "Creation"; } public Poll getPoll() { if (poll == null) { - poll = newService(PollService.class).getNewPoll(); + UserAccount userAccount = getPollenSession().getUserAccount(); + poll = newService(PollService.class).getNewPoll(userAccount); } return poll; } + public Map<String, String> getPollTypes() { + return pollTypes; + } + + public Map<String, String> getVoteCountingTypes() { + return voteCountingTypes; + } + + public Map<String, String> getChoiceTypes() { + return choiceTypes; + } + + public boolean isNotification() { + return notification; + } + + public void setNotification(boolean notification) { + this.notification = notification; + } + + public boolean isReminder() { + return reminder; + } + + public void setReminder(boolean reminder) { + this.reminder = reminder; + } + + public boolean isLimitChoice() { + return limitChoice; + } + + public void setLimitChoice(boolean limitChoice) { + this.limitChoice = limitChoice; + } + + public int getReminderHourCountdown() { + return reminderHourCountdown; + } + + public void setReminderHourCountdown(int reminderHourCountdown) { + this.reminderHourCountdown = reminderHourCountdown; + } + + public int getNotificationNumber() { + return notificationNumber; + } + + public void setNotificationNumber(int notificationNumber) { + this.notificationNumber = notificationNumber; + } + @Override public String execute() throws Exception { PollService service = newService(PollService.class); - try { - Poll basicPoll = service.createBasicPoll(poll); +// try { +// Poll basicPoll = service.createBasicPoll(poll); +// +// return SUCCESS; +// } catch (TopiaException e) { +// +// } - return SUCCESS; - } catch (TopiaException e) { + // back to input + return INPUT; + } + @Override + public void prepare() throws Exception { + + pollTypes = Maps.newHashMap(); + for (PollType pollType : PollType.values()) { + pollTypes.put(pollType.name(), _(pollType.getI18nKey())); } + voteCountingTypes = Maps.newHashMap(); + for (VoteCountingType voteCountingType : VoteCountingType.values()) { + voteCountingTypes.put(voteCountingType.name(), _(voteCountingType.getI18nKey())); + } - // back to input - return INPUT; - + choiceTypes = Maps.newHashMap(); + for (ChoiceType choiceType : ChoiceType.values()) { + choiceTypes.put(choiceType.name(), _(choiceType.getI18nKey())); + } } } Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-24 16:49:31 UTC (rev 3119) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-24 16:50:44 UTC (rev 3120) @@ -1,3 +1,4 @@ +poll.common.select.choiceType=Select the type of choice pollen.action.create=Create pollen.action.createUser=Create a new user pollen.action.delete=Delete @@ -8,8 +9,13 @@ pollen.action.register=Register pollen.action.validate=Submit pollen.common.admin=Admin +pollen.common.beginChoiceDate=Begin choice date +pollen.common.beginDate=Begin date pollen.common.bugReport=Bug report +pollen.common.description=Description pollen.common.email=Em@il +pollen.common.endChoiceDate=end choice date +pollen.common.endDate=End date pollen.common.firstName=First name pollen.common.lastName=Last name pollen.common.license=Licence @@ -19,7 +25,23 @@ pollen.common.or=or pollen.common.password=Password pollen.common.password2=Renter your password +pollen.common.pollOption.anonymous=Anonymous +pollen.common.pollOption.anonymousVoteAllowed=Anonymous vote allowed +pollen.common.pollOption.continuousResults=Continous results +pollen.common.pollOption.limitChoice=Limit number of choice per vote +pollen.common.pollOption.notification=Receive notification emails +pollen.common.pollOption.publicResults=Public results +pollen.common.pollOption.reminder=Send reminder emails +pollen.common.pollOption.notificationNumber=After each n votes +pollen.common.pollOption.reminderHourCountdown=Hours before end +pollen.common.pollOption.choiceAddAllowed=Allow adding choices +pollen.common.pollOption.maxChoiceNb=Limit +pollen.common.pollType=Poll type +pollen.action.createPoll=Create the poll + +pollen.common.title=Title pollen.common.userSupport=User support +pollen.common.voteCountingType=Counting type pollen.error.email.required=You must provide a email pollen.error.login.required=You must provide a login pollen.error.password.required=Your must provide a password @@ -31,6 +53,10 @@ pollen.error.user.login.already.used=This login is already used pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Login +pollen.fieldset.poll.choices=Choices +pollen.fieldset.poll.general=Your poll +pollen.fieldset.poll.options=Options +pollen.fieldset.poll.you=You pollen.fieldset.userInformation=Informations de l'utilisateur pollen.fieldset.userInformation.toCreate=User informations to create pollen.fieldset.userInformation.toDelete=User informations to delete Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-24 16:49:31 UTC (rev 3119) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-24 16:50:44 UTC (rev 3120) @@ -1,3 +1,4 @@ +poll.common.select.choiceType=Sélectionner le type de choix pollen.action.create=Créer pollen.action.createUser=Créer un nouvel utilisateur pollen.action.delete=Supprimer @@ -8,8 +9,13 @@ pollen.action.register=S'enregistrer pollen.action.validate=Valider pollen.common.admin=Admin +pollen.common.beginChoiceDate=Date de début des choix +pollen.common.beginDate=Date de début pollen.common.bugReport=Rapport de bug +pollen.common.description=Description pollen.common.email=Em@il +pollen.common.endChoiceDate=Date de fin des choix +pollen.common.endDate=Date de fin pollen.common.firstName=Prénom pollen.common.lastName=Nom pollen.common.license=Licence @@ -19,7 +25,22 @@ pollen.common.or=ou pollen.common.password=Mot de passe pollen.common.password2=Répétez votre mot de passe +pollen.common.pollOption.anonymous=Sondage anonyme +pollen.common.pollOption.anonymousVoteAllowed=Autoriser le vote anonyme +pollen.common.pollOption.continuousResults=Résultats continus +pollen.common.pollOption.limitChoice=Limiter le nombre de choix par vote +pollen.common.pollOption.notification=Recevoir des emails de notification +pollen.common.pollOption.publicResults=Résultats publics +pollen.common.pollOption.reminder=Envoyer des emails de rappel +pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage +pollen.common.pollOption.notificationNumber=Tous les n votes +pollen.common.pollOption.choiceAddAllowed=Autoriser l'ajout de choix +pollen.action.createPoll=Créer le sondage +pollen.common.pollOption.maxChoiceNb=Limite +pollen.common.pollType=Type de sondage +pollen.common.title=Titre pollen.common.userSupport=Support utilisateur +pollen.common.x=Dépouillement pollen.error.email.required=Courriel obligatoire pollen.error.login.required=Login obligatoire pollen.error.password.required=Mot de passe obligatoire @@ -31,6 +52,10 @@ pollen.error.user.login.already.used=Le login saisie est déjà utilisé par un autre utilisateur pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Connexion +pollen.fieldset.poll.choices=Les choix +pollen.fieldset.poll.general=Votre sondage +pollen.fieldset.poll.options=Les options +pollen.fieldset.poll.you=Vous pollen.fieldset.userInformation=Informations de l'utilisateur pollen.fieldset.userInformation.toCreate=Informations de l'utilisateur à créer pollen.fieldset.userInformation.toDelete=Informations de l'utilisateur à supprimer Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-24 16:49:31 UTC (rev 3119) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createPoll.jsp 2012-01-24 16:50:44 UTC (rev 3120) @@ -23,28 +23,115 @@ --%> <%@ page language="java" contentType="text/html" pageEncoding="utf-8" %> <%@ taglib prefix="s" uri="/struts-tags" %> +<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> +<script type="text/javascript"> + jQuery(document).ready(function () { + $('[name="poll.choiceAddAllowed"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#addChoiceAddAllowedPanel').show(); + } else { + $('#addChoiceAddAllowedPanel').hide(); + } + }); + + $('[name="limitChoice"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#maxChoiceNbPanel').show(); + } else { + $('#maxChoiceNbPanel').hide(); + } + }); + + $('[name="reminder"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#reminderPanel').show(); + } else { + $('#reminderPanel').hide(); + } + }); + + $('[name="notification"]').change(function(event) { + var val = $(this).prop('checked'); + if (val) { + $('#notificationPanel').show(); + } else { + $('#notificationPanel').hide(); + } + }); + + $('[name="poll.anonymous"]').change(function(event) { + var val = $(this).prop('checked'); + $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); + }); + $('[name="poll.continuousResults"]').change(function(event) { + var val = $(this).prop('checked'); + $('[name="poll.publicResults"]').prop('checked', val); + }); + }); +</script> <title><s:text name="pollen.title.createPoll"/></title> <h1 class="title${pageLogo}"><s:text name="pollen.title.createPoll"/></h1> -<s:form method="POST" key="registerForm"> +<s:form method="POST" key="registerForm" namespace="/poll"> <fieldset> - <legend><s:text name="pollen.fieldset.connexionInformation"/></legend> + <legend><s:text name="pollen.fieldset.poll.you"/></legend> + <s:textfield key="poll.creator.name" label="%{getText('pollen.common.login')}" required="true"/> + <s:textfield key="poll.creator.email" label="%{getText('pollen.common.email')}"/> + </fieldset> - <s:textfield name="user.login" key="pollen.common.login" required="true"/> - <s:password name="user.password" key="pollen.common.password" required="true"/> - <s:password name="password2" key="pollen.common.password2" required="true"/> + <fieldset> + <legend><s:text name="pollen.fieldset.poll.general"/></legend> + + <s:textfield key="poll.title" label="%{getText('pollen.common.title')}" required="true"/> + <s:textfield key="poll.description" label="%{getText('pollen.common.description')}"/> + <sj:datepicker key="poll.beginDate" label="%{getText('pollen.common.beginDate')}" displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endDate" label="%{getText('pollen.common.endDate')}" displayFormat="dd/mm/yy"/> + <s:radio key='poll.type' list="pollTypes" label='%{getText("pollen.common.pollType")}' /> + <s:radio key='poll.voteCounting' list="voteCountingTypes" label='%{getText("pollen.common.voteCountingType")}' /> </fieldset> <fieldset> - <legend><s:text name="pollen.fieldset.userInformation"/></legend> + <legend><s:text name="pollen.fieldset.poll.options"/></legend> - <s:textfield name="user.email" key="pollen.common.email" required="true"/> - <s:textfield name="user.firstName" key="pollen.common.firstName"/> - <s:textfield name="user.lastName" key="pollen.common.lastName"/> + <s:checkbox key="poll.anonymous" label="%{getText('pollen.common.pollOption.anonymous')}" /> + <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" /> + <s:checkbox key="poll.continuousResults" label="%{getText('pollen.common.pollOption.continuousResults')}" /> + <s:checkbox key="poll.publicResults" label="%{getText('pollen.common.pollOption.publicResults')}" /> + <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" /> + <div id='addChoiceAddAllowedPanel' class="hidden"> + <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" displayFormat="dd/mm/yy"/> + <sj:datepicker key="poll.endChoiceDate" label="%{getText('pollen.common.endChoiceDate')}" displayFormat="dd/mm/yy"/> + </div> + <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" /> + <div id='maxChoiceNbPanel' class="hidden"> + <s:textfield key="poll.maxChoiceNb" label="%{getText('pollen.common.pollOption.maxChoiceNb')}"/> + </div> + <s:checkbox key="notification" label="%{getText('pollen.common.pollOption.notification')}" /> + <div id='notificationPanel' class="hidden"> + <s:textfield key="notificationNumber" + label="%{getText('pollen.common.pollOption.notificationNumber')}" /> + </div> + <s:checkbox key="reminder" label="%{getText('pollen.common.pollOption.reminder')}" /> + <div id='reminderPanel' class="hidden"> + <s:textfield key="reminderHourCountdown" + label="%{getText('pollen.common.pollOption.reminderHourCountdown')}" /> + </div> + </fieldset> + + <fieldset> + <legend><s:text name="pollen.fieldset.poll.choices"/></legend> + <s:select key="poll.choiceType" label='%{getText("poll.common.select.choiceType")}' + list="choiceTypes" headerKey="" headerValue=""/> + + </fieldset> + <br/> - <s:submit action="registerUser" key="pollen.action.register" align="center"/> + <s:submit action="createPoll" key="pollen.action.createPoll" align="center"/> </s:form>

1 0

r3119 - branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services
by tchemit＠users.chorem.org 24 Jan '12

24 Jan '12

Author: tchemit Date: 2012-01-24 17:49:31 +0100 (Tue, 24 Jan 2012) New Revision: 3119 Url: http://chorem.org/repositories/revision/pollen/3119 Log: remove boolean return for delete Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java 2012-01-24 14:20:33 UTC (rev 3118) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java 2012-01-24 16:49:31 UTC (rev 3119) @@ -244,17 +244,17 @@ try { PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); dao.delete(poll); + //FIXME tchemit-20120124 Remove any other sotrages relatives to this poll (images choices for example). } catch (TopiaException e) { throw new PollenTechnicalException(e); } } - public boolean deleteChoice(Choice choice) { + public void deleteChoice(Choice choice) { try { ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction()); dao.delete(choice); - //FIXME tchemit-20120123 Why return true ? - return true; + //FIXME tchemit-20120124 Remove any other sotrages relatives to this poll (images choices for example). } catch (TopiaException e) { throw new PollenTechnicalException(e); }

1 0

r3118 - in branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp: WEB-INF/decorators css
by athimel＠users.chorem.org 24 Jan '12

24 Jan '12

Author: athimel Date: 2012-01-24 15:20:33 +0100 (Tue, 24 Jan 2012) New Revision: 3118 Url: http://chorem.org/repositories/revision/pollen/3118 Log: Add a flag for Beta version Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-24 14:15:29 UTC (rev 3117) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-24 14:20:33 UTC (rev 3118) @@ -41,6 +41,11 @@ <sj:head jqueryui="true" jquerytheme="cupertino"/> </head> +<%-- TODO AThimel 24/01/2012 Remove this when refactoring is over --%> +<div id="in-progress"> + <a href="http://chorem.org/projects/pollen">Version βeta</a> +</div> + <s:set var="user" value="%{#session.pollenSession.userAccount}"/> <s:set var="userExists" value="%{#user != null}"/> <s:set var="userIsAdmin" value="%{#userExists && #user.admin}"/> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-24 14:15:29 UTC (rev 3117) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-24 14:20:33 UTC (rev 3118) @@ -467,3 +467,29 @@ border-color: #000; border-width: 2px; } + + + +#in-progress { + -moz-transform: rotate(-45deg); + -webkit-transform:rotate(-45deg); + background-color: #00cc00; + box-shadow: 0 0 1em #888888; + left: -4em; + overflow: hidden; + position: fixed; + top: 2.5em; + width: 200px; + z-index: 999; +} +#in-progress a { + border: 1px solid #FFAAAA; + color: #FFFFFF; + display: block; + font-size: 1.1em; + font-weight: bold; + padding: 0.5em; + text-align: center; + text-decoration: none; + text-shadow: 1px 1px 10px #000000; +} \ No newline at end of file

1 0

r3117 - branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services
by tchemit＠users.chorem.org 24 Jan '12

24 Jan '12

Author: tchemit Date: 2012-01-24 15:15:29 +0100 (Tue, 24 Jan 2012) New Revision: 3117 Url: http://chorem.org/repositories/revision/pollen/3117 Log: split PolleService into PollCommentService Added: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollCommentService.java Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java Added: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollCommentService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollCommentService.java (rev 0) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollCommentService.java 2012-01-24 14:15:29 UTC (rev 3117) @@ -0,0 +1,96 @@ +/* + * #%L + * Pollen :: Services + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services; + +import org.chorem.pollen.PollenDAOHelper; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.entity.Comment; +import org.chorem.pollen.entity.CommentDAO; +import org.chorem.pollen.entity.CommentImpl; +import org.chorem.pollen.entity.Poll; +import org.chorem.pollen.entity.PollAccount; +import org.chorem.pollen.entity.PollDAO; +import org.nuiton.topia.TopiaException; + +/** + * Manage comments on a poll. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.0 + */ +public class PollCommentService extends PollenServiceSupport { + + public int getNbComments(Poll poll) { + try { + PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); + + Poll pollFound = dao.findByTopiaId(poll.getTopiaId()); + + int result = pollFound.sizeComment(); + return result; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public Comment createComment(Poll poll, Comment comment) { + try { + CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); + + Comment commentCreated = dao.create( + Comment.PROPERTY_AUTHOR, comment.getAuthor(), + Comment.PROPERTY_COMMENT_DATE, serviceContext.getCurrentTime(), + Comment.PROPERTY_TEXT, comment.getText() + ); + + PollDAO pollDAO = PollenDAOHelper.getPollDAO(getTransaction()); + + Poll pollToUpdate = pollDAO.findByTopiaId(poll.getTopiaId()); + + pollToUpdate.addComment(commentCreated); + + pollDAO.update(pollToUpdate); + return commentCreated; + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public void deleteComment(Comment comment) { + try { + CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); + dao.delete(comment); + } catch (TopiaException e) { + throw new PollenTechnicalException(e); + } + } + + public Comment getNewComment(PollAccount account) { + Comment result = new CommentImpl(); + if (account != null) { + result.setAuthor(account.getName()); + } + return result; + } +} Property changes on: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollCommentService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java 2012-01-24 14:15:07 UTC (rev 3116) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java 2012-01-24 14:15:29 UTC (rev 3117) @@ -40,7 +40,6 @@ import org.chorem.pollen.entity.ChoiceImpl; import org.chorem.pollen.entity.Comment; import org.chorem.pollen.entity.CommentDAO; -import org.chorem.pollen.entity.CommentImpl; import org.chorem.pollen.entity.Participant; import org.chorem.pollen.entity.ParticipantList; import org.chorem.pollen.entity.Poll; @@ -71,11 +70,6 @@ /** Logger. */ private static final Log log = LogFactory.getLog(PollService.class); - public Poll getNewPoll() { - Poll result = new PollImpl(); - return result; - } - /** * Build a new Poll instance with given {@code user} as administrator * @@ -83,7 +77,7 @@ * @return Build a new Poll instance with given {@code user} as administrator */ public Poll getNewPoll(UserAccount user) { - Poll result = getNewPoll(); + Poll result = new PollImpl(); result.setChoiceType(ChoiceType.TEXT); result.setVoteCounting(VoteCountingType.NORMAL); result.setType(PollType.FREE); @@ -110,7 +104,7 @@ * @return Build a new Poll instance based on existing {@code poll} (copy) */ public Poll getNewPoll(Poll poll) { - Poll result = getNewPoll(); + Poll result = new PollImpl(); TopiaEntityBinder<Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); //TODO-fdesbois-2010-07-13 : add test and check if exluding only those properties is realistic binder.copyExcluding(poll, result, @@ -433,61 +427,6 @@ } } - public int getNbComments(Poll poll) { - try { - PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction()); - - Poll pollFound = dao.findByTopiaId(poll.getTopiaId()); - - int result = pollFound.sizeComment(); - return result; - } catch (TopiaException e) { - throw new PollenTechnicalException(e); - } - } - - public Comment createComment(Poll poll, Comment comment) { - try { - CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); - - Comment commentCreated = dao.create( - Comment.PROPERTY_AUTHOR, comment.getAuthor(), - Comment.PROPERTY_COMMENT_DATE, serviceContext.getCurrentTime(), - Comment.PROPERTY_TEXT, comment.getText() - ); - - PollDAO pollDAO = PollenDAOHelper.getPollDAO(getTransaction()); - - Poll pollToUpdate = pollDAO.findByTopiaId(poll.getTopiaId()); - - pollToUpdate.addComment(commentCreated); - - pollDAO.update(pollToUpdate); - return commentCreated; - } catch (TopiaException e) { - throw new PollenTechnicalException(e); - } - } - - //FIXME tchemit-20120123 Why returning true ? - public boolean deleteComment(Comment comment) { - try { - CommentDAO dao = PollenDAOHelper.getCommentDAO(getTransaction()); - dao.delete(comment); - return true; - } catch (TopiaException e) { - throw new PollenTechnicalException(e); - } - } - - public Comment getNewComment(PollAccount account) { - Comment result = new CommentImpl(); - if (account != null) { - result.setAuthor(account.getName()); - } - return result; - } - public Choice createChoice(Poll poll, Choice choice) { try { ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(getTransaction());

1 0