Pollen-commits

Download

pollen-commits@list.chorem.org

April 2012

5 participants
111 discussions

April 17, 2012

Author: maven-release Date: 2012-04-17 18:23:28 +0200 (Tue, 17 Apr 2012) New Revision: 3283 Url: http://chorem.org/repositories/revision/pollen/3283 Log: add svn:keywords Modified: trunk/pollen-business/LICENSE.txt trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/package-info.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataCommentConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataUserConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/package-info.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/CommentDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PersonListDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultListDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/UserDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/package-info.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/package-info.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoice.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceComment.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResults.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/package-info.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MD5.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/package-info.java trunk/pollen-business/src/main/resources/log4j.properties trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml trunk/pollen-business/src/main/xmi/pollen.properties trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/converters/EnumControllerTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/package-info.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceChoiceImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceCommentImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceListImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java trunk/pollen-business/src/test/java/org/chorem/pollen/business/utils/PropertiesLoaderTest.java trunk/pollen-business/src/test/resources/pollen.properties trunk/pollen-domain/LICENSE.txt trunk/pollen-domain/pom.xml trunk/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java trunk/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java trunk/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java trunk/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java trunk/pollen-domain/src/test/resources/log4j.properties trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css trunk/pollen-ui-struts2/src/main/webapp/img/tooltip.png trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js trunk/pollen-ui/pom.xml Modified: trunk/pollen-business/LICENSE.txt =================================================================== --- trunk/pollen-business/LICENSE.txt 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/LICENSE.txt 2012-04-17 16:23:28 UTC (rev 3283) @@ -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: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/pom.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,7 +1,5 @@ <?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> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/PreventRuleManager.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/package-info.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/business/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Classes métiers utiles pour l'application. */ Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataChoiceConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataCommentConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataCommentConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataCommentConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPersonListConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollAccountConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPreventRuleConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataResultConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataUserConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataUserConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataUserConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVoteCountingConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataVotingListConverter.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/package-info.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Gestion de la conversion des DTO en entités et des entités en DTO. */ Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/CommentDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/CommentDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/CommentDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PersonListDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PersonListDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PersonListDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultListDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultListDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ResultListDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ package org.chorem.pollen.business.dto; import java.util.List; Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/UserDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/UserDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/UserDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VoteDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/package-info.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Data Transfert Objects. */ Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/PollenMigrationCallbackHandler.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/package-info.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/migration/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Migration de la base de données. */ Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuth.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceAuthImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoice.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoice.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoice.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceChoiceImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceComment.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceComment.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceComment.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceCommentImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceListImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccountImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRuleImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResults.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResults.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResults.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceResultsImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUser.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceUserImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVote.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceVoteImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/package-info.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Services proposés par le module Business. */ Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MD5.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MD5.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MD5.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/MailUtil.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/PropertiesLoader.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/package-info.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /** * Classes utilitaires. */ Modified: trunk/pollen-business/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-business/src/main/resources/log4j.properties 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/log4j.properties 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +### +# #%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% +### # Global logging configuration log4j.rootLogger=WARN, stdout # Console output... Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ChoiceImpl" table="choice" node="org.chorem.pollen.business.persistence.ChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Choice" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" table="choiceType" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.ChoiceType" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.CommentImpl" table="comment" node="org.chorem.pollen.business.persistence.CommentImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Comment" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PersonListImpl" table="personList" node="org.chorem.pollen.business.persistence.PersonListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PersonToListImpl" table="personToList" node="org.chorem.pollen.business.persistence.PersonToListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonToList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollAccountImpl" table="pollAccount" node="org.chorem.pollen.business.persistence.PollAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollAccount" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollImpl" table="poll" node="org.chorem.pollen.business.persistence.PollImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Poll" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollTypeImpl" table="pollType" node="org.chorem.pollen.business.persistence.PollTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollType" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PreventRuleImpl" table="preventRule" node="org.chorem.pollen.business.persistence.PreventRuleImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PreventRule" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ResultImpl" table="result" node="org.chorem.pollen.business.persistence.ResultImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Result" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.UserAccountImpl" table="userAccount" node="org.chorem.pollen.business.persistence.UserAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.UserAccount" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteCountingImpl" table="voteCounting" node="org.chorem.pollen.business.persistence.VoteCountingImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteCounting" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteImpl" table="vote" node="org.chorem.pollen.business.persistence.VoteImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Vote" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" table="voteToChoice" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteToChoice" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VotingListImpl" table="votingList" node="org.chorem.pollen.business.persistence.VotingListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VotingList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ChoiceImpl" table="choice" node="org.chorem.pollen.business.persistence.ChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Choice" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" table="choiceType" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.ChoiceType" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.CommentImpl" table="comment" node="org.chorem.pollen.business.persistence.CommentImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Comment" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PersonListImpl" table="personList" node="org.chorem.pollen.business.persistence.PersonListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PersonToListImpl" table="personToList" node="org.chorem.pollen.business.persistence.PersonToListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonToList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollAccountImpl" table="pollAccount" node="org.chorem.pollen.business.persistence.PollAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollAccount" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollImpl" table="poll" node="org.chorem.pollen.business.persistence.PollImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Poll" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollTypeImpl" table="pollType" node="org.chorem.pollen.business.persistence.PollTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollType" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PreventRuleImpl" table="preventRule" node="org.chorem.pollen.business.persistence.PreventRuleImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PreventRule" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ResultImpl" table="result" node="org.chorem.pollen.business.persistence.ResultImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Result" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.UserAccountImpl" table="userAccount" node="org.chorem.pollen.business.persistence.UserAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.UserAccount" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteCountingImpl" table="voteCounting" node="org.chorem.pollen.business.persistence.VoteCountingImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteCounting" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteImpl" table="vote" node="org.chorem.pollen.business.persistence.VoteImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Vote" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" table="voteToChoice" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteToChoice" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VotingListImpl" table="votingList" node="org.chorem.pollen.business.persistence.VotingListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VotingList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ChoiceImpl" table="choice" node="org.chorem.pollen.business.persistence.ChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Choice" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" table="choiceType" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.ChoiceType" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.CommentImpl" table="comment" node="org.chorem.pollen.business.persistence.CommentImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Comment" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PersonListImpl" table="personList" node="org.chorem.pollen.business.persistence.PersonListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PersonToListImpl" table="personToList" node="org.chorem.pollen.business.persistence.PersonToListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonToList" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollAccountImpl" table="pollAccount" node="org.chorem.pollen.business.persistence.PollAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollAccount" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollImpl" table="poll" node="org.chorem.pollen.business.persistence.PollImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Poll" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PollTypeImpl" table="pollType" node="org.chorem.pollen.business.persistence.PollTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollType" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.PreventRuleImpl" table="preventRule" node="org.chorem.pollen.business.persistence.PreventRuleImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PreventRule" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.ResultImpl" table="result" node="org.chorem.pollen.business.persistence.ResultImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Result" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.UserAccountImpl" table="userAccount" node="org.chorem.pollen.business.persistence.UserAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.UserAccount" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteCountingImpl" table="voteCounting" node="org.chorem.pollen.business.persistence.VoteCountingImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteCounting" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteImpl" table="vote" node="org.chorem.pollen.business.persistence.VoteImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Vote" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" table="voteToChoice" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteToChoice" > Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.2/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> + + <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> <class name="org.chorem.pollen.business.persistence.VotingListImpl" table="votingList" node="org.chorem.pollen.business.persistence.VotingListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VotingList" > Modified: trunk/pollen-business/src/main/xmi/pollen.properties =================================================================== --- trunk/pollen-business/src/main/xmi/pollen.properties 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/main/xmi/pollen.properties 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +### +# #%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% +### model.tagvalue.notGenerateToString=true #model.tagvalue.dbSchema=Pollen model.tagvalue.constantPrefix=PROPERTY_ Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/business/PreventRuleManagerTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/converters/EnumControllerTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/converters/EnumControllerTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/converters/EnumControllerTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/ScalingVote.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2010 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/package-info.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/package-info.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/scaling/package-info.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceAuthImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceChoiceImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceChoiceImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceChoiceImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceCommentImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceCommentImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceCommentImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceListImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceListImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceListImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePreventRuleImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServiceUserImplTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/utils/PropertiesLoaderTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/utils/PropertiesLoaderTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/utils/PropertiesLoaderTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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% + */ /* *##% Pollen * Copyright (C) 2009 CodeLutin * Modified: trunk/pollen-business/src/test/resources/pollen.properties =================================================================== --- trunk/pollen-business/src/test/resources/pollen.properties 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-business/src/test/resources/pollen.properties 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +### +# #%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% +### # Configuration de la base de données hibernate.hbm2ddl.auto=update hibernate.show_sql=false Modified: trunk/pollen-domain/LICENSE.txt =================================================================== --- trunk/pollen-domain/LICENSE.txt 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/LICENSE.txt 2012-04-17 16:23:28 UTC (rev 3283) @@ -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 Modified: trunk/pollen-domain/pom.xml =================================================================== --- trunk/pollen-domain/pom.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/pom.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,14 +1,12 @@ <?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> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> @@ -31,10 +29,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> +  <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> Modified: trunk/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java =================================================================== --- trunk/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/main/java/org/chorem/poll/domain/PollenDomainFunctions.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain; /** Modified: trunk/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java =================================================================== --- trunk/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/main/java/org/chorem/poll/domain/strategy/VoteCountingStrategy.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain.strategy; import org.chorem.poll.domain.poll.PollVoteCountingChoice; Modified: trunk/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java =================================================================== --- trunk/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/java/org/chorem/poll/domain/ImportExportServiceTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain; import org.junit.Test; Modified: trunk/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java =================================================================== --- trunk/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/java/org/chorem/poll/domain/VoteCountingServiceTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain; import org.junit.Test; Modified: trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/CondorcetVoteCountingStrategyTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain.strategy; import org.junit.Test; Modified: trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/NumberVoteCountingStrategyTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain.strategy; import org.junit.Test; Modified: trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/PercentageVoteCountingStrategyTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain.strategy; import org.junit.Test; Modified: trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java =================================================================== --- trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/java/org/chorem/poll/domain/strategy/StandardVoteCountingStrategyTest.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%L + * Pollen :: Domain + * + * $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.poll.domain.strategy; import org.junit.Test; Modified: trunk/pollen-domain/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-domain/src/test/resources/log4j.properties 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-domain/src/test/resources/log4j.properties 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +### +# #%L +# Pollen :: Domain +# +# $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: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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 com.google.common.collect.Lists; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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; /** Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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; /** Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-ui/pom.xml 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,7 +1,5 @@ <?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> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> @@ -153,8 +151,7 @@ <artifactId>jetty-maven-plugin</artifactId> <configuration> <connectors> - <connector - implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> + <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector"> <port>8888</port> </connector> </connectors> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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; /** Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,3 +1,26 @@ +/* + * #%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.apache.commons.lang3.StringUtils; Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,27 @@ /* + * #%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% + */ +/* * jQuery UI CSS Framework 1.8.18 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) Modified: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-04-17 16:08:36 UTC (rev 3282) +++ trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css 2012-04-17 16:23:28 UTC (rev 3283) @@ -1,4 +1,27 @@ /* + * #%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% + */ +/* * jQuery UI CSS Framework 1.8.18 * * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about) Property changes on: trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/webapp/img/tooltip.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3282 - in trunk/pollen-ui-struts2/src/main: resources/i18n webapp/WEB-INF/jsp/poll webapp/WEB-INF/jsp/user webapp/css webapp/img webapp/js
by fdesbois＠users.chorem.org April 17, 2012

April 17, 2012

Author: fdesbois Date: 2012-04-17 18:08:36 +0200 (Tue, 17 Apr 2012) New Revision: 3282 Url: http://chorem.org/repositories/revision/pollen/3282 Log: add tooltip infos Added: trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css trunk/pollen-ui-struts2/src/main/webapp/img/tooltip.png trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pollen-ui-struts2/src/main/webapp/css/common.css trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-17 16:08:36 UTC (rev 3282) @@ -67,6 +67,7 @@ pollen.common.email=Em@il pollen.common.endChoiceDate=end choice date pollen.common.endDate=End date +pollen.common.favoriteList.csvImport.help=The file to upload is a text file that contains one row per participant.<br/><br/>The first line must be <strong>votingId,email</strong>, then each next ones will define the participant's name and his email separated by a comma.<br/><br/>Here is an example \:<br/> pollen.common.firstName=First name pollen.common.functions=Functions pollen.common.group=group @@ -86,17 +87,26 @@ pollen.common.personToList=Voter pollen.common.pollCreator=Creator pollen.common.pollOption.anonymous=Anonymous +pollen.common.pollOption.anonymous.help=Voting persons and their votes are anonymous pollen.common.pollOption.anonymousVoteAllowed=Anonymous vote allowed +pollen.common.pollOption.anonymousVoteAllowed.help=Voting persons can be anonymous pollen.common.pollOption.choiceAddAllowed=Allow adding choices +pollen.common.pollOption.choiceAddAllowed.help=You can add choices to the poll pollen.common.pollOption.continuousResults=Continous results +pollen.common.pollOption.continuousResults.help=Poll results are displayed continuously during the vote pollen.common.pollOption.limitChoice=Limit number of choice per vote +pollen.common.pollOption.limitChoice.help=The user can select a limited number of choices pollen.common.pollOption.maxChoiceNb=Limit pollen.common.pollOption.notification=Receive notification emails +pollen.common.pollOption.notification.help=An email is sent to you for each vote pollen.common.pollOption.notificationNumber=After each n votes pollen.common.pollOption.publicResults=Public results +pollen.common.pollOption.publicResults.help=Poll results are available for everybody pollen.common.pollOption.reminder=Send reminder emails +pollen.common.pollOption.reminder.help=An email is sent to remind persons who have not yet voted N hours before poll end pollen.common.pollOption.reminderHourCountdown=Hours before end pollen.common.pollType=Who can vote ? +pollen.common.pollType.help=Free\: accessible to everyone <br/><br/> Restricted\: accessible only to a list of persons <br/><br/> Group\: accessible to several lists of persons pollen.common.postDate=Comment date pollen.common.results=Results\: pollen.common.select.choiceType=Select the type of choice @@ -112,6 +122,7 @@ pollen.common.voteAction=Vote pollen.common.voteCounting-label=Vote Counting\: pollen.common.voteCountingType=Response type +pollen.common.voteCountingType.help=Normal\: selecting 1 to n choices among available choices <br/><br/> Percentage\: allocating a percentage to each choice <br/><br/> Condorcet\: ranking choices in order of preference <br/><br/> Number \: Free response. Summed and the average numbers. pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. pollen.common.voteCountingTypeHelp.normal=Normal vote\: vote for your favorite choice. pollen.common.voteCountingTypeHelp.number=Voting by number\: The answer is free, leave blank or enter a integer. Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-17 16:08:36 UTC (rev 3282) @@ -72,6 +72,7 @@ pollen.common.email=Em@il pollen.common.endChoiceDate=Date de fin des choix pollen.common.endDate=Date de fin +pollen.common.favoriteList.csvImport.help=Le fichier à importer doit être un fichier texte contenant une ligne par participant.<br/><br/>La première ligne doit contenir <strong>votingId,email</strong>, ensuite chacune des suivantes définira le nom du participant et son email séparés par une virgule.<br/><br/>Voici un exemple \:<br/> pollen.common.firstName=Prénom pollen.common.functions=Fonctions pollen.common.group=groupes @@ -93,17 +94,25 @@ pollen.common.personToList=Votant pollen.common.pollCreator=Créateur pollen.common.pollOption.anonymous=Sondage anonyme +pollen.common.pollOption.anonymous.help=Les votants ainsi que leurs votes sont anonymes pollen.common.pollOption.anonymousVoteAllowed=Autoriser le vote anonyme +pollen.common.pollOption.anonymousVoteAllowed.help=Les votants peuvent être anonymes pollen.common.pollOption.choiceAddAllowed=Autoriser l'ajout de choix +pollen.common.pollOption.choiceAddAllowed.help=Il est possible d'ajouter des choix au sondage pollen.common.pollOption.continuousResults=Résultats continus +pollen.common.pollOption.continuousResults.help=Les résultats du sondage sont affichés en continu au moment du vote pollen.common.pollOption.limitChoice=Limiter le nombre de choix par vote +pollen.common.pollOption.limitChoice.help=Le nombre de choix que l'utilisateur peut sélectionner est limité 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.notification.help=Un email vous est envoyé à chaque vote pollen.common.pollOption.publicResults=Résultats publics +pollen.common.pollOption.publicResults.help=Les résultats du sondage sont consultables par tout le monde pollen.common.pollOption.reminder=Envoyer des emails de rappel +pollen.common.pollOption.reminder.help=Un email de rappel est envoyé aux votants qui n'ont pas encore voté N heures avant la fin du sondage pollen.common.pollOption.reminderHourCountdown=heures avant la fin du sondage pollen.common.pollType=Qui peut voter ? +pollen.common.pollType.help=Libre \: accessible à tout le monde <br/><br/> Restreint \: accessible uniquement à une liste de votants <br/><br/> Groupe \: accessible à plusieurs listes de votants pollen.common.postDate=Date du commentaire pollen.common.results=Résultats \: pollen.common.select.choiceType=Sélectionner le type de choix @@ -118,6 +127,7 @@ pollen.common.vote.return-help=Retour au sondage pollen.common.voteAction=Vote pollen.common.voteCountingType=Type de Réponse +pollen.common.voteCountingType.help=Normal \: sélection de 1 ou n choix parmis les choix possibles <br/><br/> Pourcentage \: attribution d'un pourcentage à chaque choix <br/><br/> Condorcet \: classement des choix par ordre de préférence <br/><br/> Nombre \: Réponse libre. Fait la somme et la moyenne des nombres pollen.common.voteCountingTypeHelp.condorcet=Vote Condorcet \: classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. pollen.common.voteCountingTypeHelp.normal=Vote normal \: voter pour le ou les choix préférés. pollen.common.voteCountingTypeHelp.number=Vote par nombre \: La réponse est libre, laissez vide ou entrez un nombre entier Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-04-17 16:08:36 UTC (rev 3282) @@ -26,6 +26,8 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <link rel="stylesheet" type="text/css" href="<s:url value='/css/pollCreation.css'/>"/> +<link rel="stylesheet" type="text/css" + href="<s:url value='/css/tipTip.css'/>"/> <script type="text/javascript"> @@ -60,6 +62,8 @@ <script type="text/javascript" src='<s:url value="/js/createPoll.js"/>'></script> +<script type="text/javascript" + src='<s:url value="/js/jquery.tipTip.minified.js"/>'></script> <s:url id='errorImg' value='/img/exclamation.png'/> @@ -92,7 +96,11 @@ <br/> <fieldset> - <legend><s:text name="pollen.common.voteCountingType"/></legend> + <legend> + <s:text name="pollen.common.voteCountingType"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.common.voteCountingType.help'/>"/> + </legend> <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='' theme="simple" disabled="%{voteStarted}"/> </fieldset> @@ -124,17 +132,27 @@ <s:checkbox key="poll.anonymous" label="%{getText('pollen.common.pollOption.anonymous')}" - disabled="%{voteStarted}"/> + disabled="%{voteStarted}" + tooltip="%{getText('pollen.common.pollOption.anonymous.help')}" + tooltipIconPath="/img/tooltip.png"/> <s:checkbox key="poll.anonymousVoteAllowed" label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" - disabled="%{voteStarted}"/> + disabled="%{voteStarted}" + tooltip="%{getText('pollen.common.pollOption.anonymousVoteAllowed.help')}" + tooltipIconPath="/img/tooltip.png"/> <s:checkbox key="poll.continuousResults" - label="%{getText('pollen.common.pollOption.continuousResults')}"/> + label="%{getText('pollen.common.pollOption.continuousResults')}" + tooltip="%{getText('pollen.common.pollOption.continuousResults.help')}" + tooltipIconPath="/img/tooltip.png"/> <s:checkbox key="poll.publicResults" - label="%{getText('pollen.common.pollOption.publicResults')}"/> + label="%{getText('pollen.common.pollOption.publicResults')}" + tooltip="%{getText('pollen.common.pollOption.publicResults.help')}" + tooltipIconPath="/img/tooltip.png"/> <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" - disabled="%{voteStarted}"/> + disabled="%{voteStarted}" + tooltip="%{getText('pollen.common.pollOption.choiceAddAllowed.help')}" + tooltipIconPath="/img/tooltip.png"/> <div id='addChoiceAddAllowedPanel' class="hidden"> <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" @@ -147,16 +165,22 @@ </div> <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" - disabled="%{voteStarted}"/> + disabled="%{voteStarted}" + tooltip="%{getText('pollen.common.pollOption.limitChoice.help')}" + tooltipIconPath="/img/tooltip.png"/> <div id='maxChoiceNbPanel' class="hidden"> <s:textfield key="poll.maxChoiceNb" label="%{getText('pollen.common.pollOption.maxChoiceNb')}" disabled="%{voteStarted}"/> </div> <s:checkbox key="notification" - label="%{getText('pollen.common.pollOption.notification')}"/> + label="%{getText('pollen.common.pollOption.notification')}" + tooltip="%{getText('pollen.common.pollOption.notification.help')}" + tooltipIconPath="/img/tooltip.png"/> <s:checkbox key="reminder" - label="%{getText('pollen.common.pollOption.reminder')}"/> + label="%{getText('pollen.common.pollOption.reminder')}" + tooltip="%{getText('pollen.common.pollOption.reminder.help')}" + tooltipIconPath="/img/tooltip.png"/> <div id='reminderPanel' class="hidden"> <s:textfield key="reminderHourCountdown" label="%{getText('pollen.common.pollOption.reminderHourCountdown')}"/> @@ -179,7 +203,11 @@ <br/> <fieldset> - <legend><s:text name="pollen.common.pollType"/></legend> + <legend> + <s:text name="pollen.common.pollType"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.common.pollType.help'/>"/> + </legend> <s:radio key='poll.pollType' list="pollTypes" label='%{getText("pollen.common.pollType")}' disabled="%{voteStarted}"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-04-17 16:08:36 UTC (rev 3282) @@ -25,11 +25,16 @@ <%@ taglib prefix="s" uri="/struts-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> + +<link rel="stylesheet" type="text/css" + href="<s:url value='/css/tipTip.css'/>"/> + <script type="text/javascript" src="<s:url value='/js/gridHelper.js' />"></script> - <script type="text/javascript" src="<s:url value='/js/favoriteLists.js' />"></script> +<script type="text/javascript" + src="<s:url value='/js/jquery.tipTip.minified.js' />"></script> <title><s:text name="pollen.title.favoriteLists"/></title> @@ -46,6 +51,8 @@ var editImg = '<s:url value='/img/edit.png'/>'; var editTitle = '<s:text name="pollen.action.editFavoriteList"/>'; var deleteImg = '<s:url value='/img/delete.png'/>'; + var csvHelp = '<div><s:text name="pollen.common.favoriteList.csvImport.help"/>' + + '<br/><img src="<s:url value="/img/import_csv_help.png"/>"/></div>' jQuery(document).ready(function () { Modified: trunk/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-04-17 16:08:36 UTC (rev 3282) @@ -144,4 +144,30 @@ padding-left: 25px; color: #880000; margin-left:0px; -} \ No newline at end of file +} +#tooltip { + position:absolute; + z-index:9999; + color:#fff; + font-size:10px; + width:180px; + + } + + #tooltip .tipHeader { + height:8px; + background:url(images/tipHeader.gif) no-repeat; + } + + /* IE hack */ + *html #tooltip .tipHeader {margin-bottom:-6px;} + + #tooltip .tipBody { + background-color:#000; + padding:5px; + } + + #tooltip .tipFooter { + height:8px; + background:url(images/tipFooter.gif) no-repeat; + } \ No newline at end of file Added: trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/css/tipTip.css 2012-04-17 16:08:36 UTC (rev 3282) @@ -0,0 +1,113 @@ +/* TipTip CSS - Version 1.2 */ + +#tiptip_holder { + display: none; + position: absolute; + top: 0; + left: 0; + z-index: 99999; +} + +#tiptip_holder.tip_top { + padding-bottom: 5px; +} + +#tiptip_holder.tip_bottom { + padding-top: 5px; +} + +#tiptip_holder.tip_right { + padding-left: 5px; +} + +#tiptip_holder.tip_left { + padding-right: 5px; +} + +#tiptip_content { + font-size: 11px; + color: #fff; + text-shadow: 0 0 2px #000; + padding: 4px 8px; + border: 1px solid rgba(255,255,255,0.25); + background-color: rgb(25,25,25); + background-color: rgba(25,25,25,0.92); + background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000)); + border-radius: 3px; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 0 0 3px #555; + -webkit-box-shadow: 0 0 3px #555; + -moz-box-shadow: 0 0 3px #555; +} + +#tiptip_arrow, #tiptip_arrow_inner { + position: absolute; + border-color: transparent; + border-style: solid; + border-width: 6px; + height: 0; + width: 0; +} + +#tiptip_holder.tip_top #tiptip_arrow { + border-top-color: #fff; + border-top-color: rgba(255,255,255,0.35); +} + +#tiptip_holder.tip_bottom #tiptip_arrow { + border-bottom-color: #fff; + border-bottom-color: rgba(255,255,255,0.35); +} + +#tiptip_holder.tip_right #tiptip_arrow { + border-right-color: #fff; + border-right-color: rgba(255,255,255,0.35); +} + +#tiptip_holder.tip_left #tiptip_arrow { + border-left-color: #fff; + border-left-color: rgba(255,255,255,0.35); +} + +#tiptip_holder.tip_top #tiptip_arrow_inner { + margin-top: -7px; + margin-left: -6px; + border-top-color: rgb(25,25,25); + border-top-color: rgba(25,25,25,0.92); +} + +#tiptip_holder.tip_bottom #tiptip_arrow_inner { + margin-top: -5px; + margin-left: -6px; + border-bottom-color: rgb(25,25,25); + border-bottom-color: rgba(25,25,25,0.92); +} + +#tiptip_holder.tip_right #tiptip_arrow_inner { + margin-top: -6px; + margin-left: -5px; + border-right-color: rgb(25,25,25); + border-right-color: rgba(25,25,25,0.92); +} + +#tiptip_holder.tip_left #tiptip_arrow_inner { + margin-top: -6px; + margin-left: -7px; + border-left-color: rgb(25,25,25); + border-left-color: rgba(25,25,25,0.92); +} + +/* Webkit Hacks */ +@media screen and (-webkit-min-device-pixel-ratio:0) { + #tiptip_content { + padding: 4px 8px 5px 8px; + background-color: rgba(45,45,45,0.88); + } + #tiptip_holder.tip_bottom #tiptip_arrow_inner { + border-bottom-color: rgba(45,45,45,0.88); + } + #tiptip_holder.tip_top #tiptip_arrow_inner { + border-top-color: rgba(20,20,20,0.92); + } +} \ No newline at end of file Added: trunk/pollen-ui-struts2/src/main/webapp/img/tooltip.png =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/img/tooltip.png (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/img/tooltip.png 2012-04-17 16:08:36 UTC (rev 3282) @@ -0,0 +1,9 @@ +�PNG + + +IHDR��asRGB��bKGD�� pHYs��+tIME�8Vڳ�IDAT8˥��K�Q��;�4_�Ѳ,J�+$J�fP�(��)�hSA�*�V�-�MB""b� ++!��,Ê4G�)��Fc�M=��9~�y��(�S�_,RFz��_�ȵq/�Żd�_�� D<��b��|�/1}}x<�w��D��5��s��v +�Bz;��*Ep�zL��Fv��ܹF*XLn��L�}'�9�D��&��q��bWU�[��L��n'O2="��C7I6"r|/іO��6�6$��_��,bm�� ᯬD��A��(@wv�׌�茐~��Ռ>gglo �z?�Q�(A��6�˖��w�R�o� +I +eǨ��Q�(��؍G�t�c��`�ZP��&0y6��R��茠��4CZ'qG��+#��*(��<�=��|o�i��D�"��/+�sWE�7g��&��C��ߑZ��+��"Jl�g��x"�� +uY��iVў�D_v2��{�|�maJ*�me�E��)n��o_y��^<��QT]�?�HE��|B<#t�w=+�?�� yf��mң�<�Bfm��x��e��\�F�V/[�IEND�B`� \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-04-17 16:08:36 UTC (rev 3282) @@ -578,4 +578,8 @@ changeChoiceType(datas['choiceType']); changePollType(datas['pollType']); + + $('.tooltip').tipTip({ + defaultPosition : 'top' + }); }); \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-04-17 13:08:52 UTC (rev 3281) +++ trunk/pollen-ui-struts2/src/main/webapp/js/favoriteLists.js 2012-04-17 16:08:36 UTC (rev 3282) @@ -56,6 +56,12 @@ $('#deleteForm').hide(); $('#createForm').show(); }); + + $('[name=csvImport]').tipTip({ + content : csvHelp, + maxWidth : '340px', + defaultPosition : 'right' + }); } function favoriteListsFunctions(cellvalue, options, rowObject) { Added: trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/js/jquery.tipTip.minified.js 2012-04-17 16:08:36 UTC (rev 3282) @@ -0,0 +1,21 @@ + /* + * TipTip + * Copyright 2010 Drew Wilson + * www.drewwilson.com + * code.drewwilson.com/entry/tiptip-jquery-plugin + * + * Version 1.3 - Updated: Mar. 23, 2010 + * + * This Plug-In will create a custom tooltip to replace the default + * browser tooltip. It is extremely lightweight and very smart in + * that it detects the edges of the browser window and will make sure + * the tooltip stays within the current window size. As a result the + * tooltip will adjust itself to be displayed above, below, to the left + * or to the right depending on what is necessary to stay within the + * browser window. It is completely customizable as well via CSS. + * + * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: + * http://www.opensource.org/licenses/mit-license.php + * http://www.gnu.org/licenses/gpl.html + */ +(function($){$.fn.tipTip=function(options){var defaults={activation:"hover",keepAlive:false,maxWidth:"200px",edgeOffset:3,defaultPosition:"bottom",delay:400,fadeIn:200,fadeOut:200,attribute:"title",content:false,enter:function(){},exit:function(){}};var opts=$.extend(defaults,options);if($("#tiptip_holder").length<=0){var tiptip_holder=$('<div id="tiptip_holder" style="max-width:'+opts.maxWidth+';"></div>');var tiptip_content=$('<div id="tiptip_content"></div>');var tiptip_arrow=$('<div id="tiptip_arrow"></div>');$("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('<div id="tiptip_arrow_inner"></div>')))}else{var tiptip_holder=$("#tiptip_holder");var tiptip_content=$("#tiptip_content");var tiptip_arrow=$("#tiptip_arrow")}return this.each(function(){var org_elem=$(this);if(opts.content){var org_title=opts.content}else{var org_title=org_elem.attr(opts.attribute)}if(org_title!=""){if(!opts.content){org_elem.removeAttr(opts.attribute)}var timeout=false;if(opts.activation=="hover"){org_elem.hover(function(){active_tiptip()},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}else if(opts.activation=="focus"){org_elem.focus(function(){active_tiptip()}).blur(function(){deactive_tiptip()})}else if(opts.activation=="click"){org_elem.click(function(){active_tiptip();return false}).hover(function(){},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}function active_tiptip(){opts.enter.call(this);tiptip_content.html(org_title);tiptip_holder.hide().removeAttr("class").css("margin","0");tiptip_arrow.removeAttr("style");var top=parseInt(org_elem.offset()['top']);var left=parseInt(org_elem.offset()['left']);var org_width=parseInt(org_elem.outerWidth());var org_height=parseInt(org_elem.outerHeight());var tip_w=tiptip_holder.outerWidth();var tip_h=tiptip_holder.outerHeight();var w_compare=Math.round((org_width-tip_w)/2);var h_compare=Math.round((org_height-tip_h)/2);var marg_left=Math.round(left+w_compare);var marg_top=Math.round(top+org_height+opts.edgeOffset);var t_class="";var arrow_top="";var arrow_left=Math.round(tip_w-12)/2;if(opts.defaultPosition=="bottom"){t_class="_bottom"}else if(opts.defaultPosition=="top"){t_class="_top"}else if(opts.defaultPosition=="left"){t_class="_left"}else if(opts.defaultPosition=="right"){t_class="_right"}var right_compare=(w_compare+left)<parseInt($(window).scrollLeft());var left_compare=(tip_w+left)>parseInt($(window).width());if((right_compare&&w_compare<0)||(t_class=="_right"&&!left_compare)||(t_class=="_left"&&left<(tip_w+opts.edgeOffset+5))){t_class="_right";arrow_top=Math.round(tip_h-13)/2;arrow_left=-12;marg_left=Math.round(left+org_width+opts.edgeOffset);marg_top=Math.round(top+h_compare)}else if((left_compare&&w_compare<0)||(t_class=="_left"&&!right_compare)){t_class="_left";arrow_top=Math.round(tip_h-13)/2;arrow_left=Math.round(tip_w);marg_left=Math.round(left-(tip_w+opts.edgeOffset+5));marg_top=Math.round(top+h_compare)}var top_compare=(top+org_height+opts.edgeOffset+tip_h+8)>parseInt($(window).height()+$(window).scrollTop());var bottom_compare=((top+org_height)-(opts.edgeOffset+tip_h+8))<0;if(top_compare||(t_class=="_bottom"&&top_compare)||(t_class=="_top"&&!bottom_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_top"}else{t_class=t_class+"_top"}arrow_top=tip_h;marg_top=Math.round(top-(tip_h+5+opts.edgeOffset))}else if(bottom_compare|(t_class=="_top"&&bottom_compare)||(t_class=="_bottom"&&!top_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_bottom"}else{t_class=t_class+"_bottom"}arrow_top=-12;marg_top=Math.round(top+org_height+opts.edgeOffset)}if(t_class=="_right_top"||t_class=="_left_top"){marg_top=marg_top+5}else if(t_class=="_right_bottom"||t_class=="_left_bottom"){marg_top=marg_top-5}if(t_class=="_left_top"||t_class=="_left_bottom"){marg_left=marg_left+5}tiptip_arrow.css({"margin-left":arrow_left+"px","margin-top":arrow_top+"px"});tiptip_holder.css({"margin-left":marg_left+"px","margin-top":marg_top+"px"}).attr("class","tip"+t_class);if(timeout){clearTimeout(timeout)}timeout=setTimeout(function(){tiptip_holder.stop(true,true).fadeIn(opts.fadeIn)},opts.delay)}function deactive_tiptip(){opts.exit.call(this);if(timeout){clearTimeout(timeout)}tiptip_holder.fadeOut(opts.fadeOut)}}})}})(jQuery); \ No newline at end of file

1 0

r3281 - in trunk: . pollen-services 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/main/resources/i18n pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user
by fdesbois＠users.chorem.org April 17, 2012

April 17, 2012

Author: fdesbois Date: 2012-04-17 15:08:52 +0200 (Tue, 17 Apr 2012) New Revision: 3281 Url: http://chorem.org/repositories/revision/pollen/3281 Log: fixes #162 : use nuiton-csv to display row in error fixes #182 : add FavoriteListImport interface and implementations for CSV and LDAP Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java Modified: trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp trunk/pom.xml Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-services/pom.xml 2012-04-17 13:08:52 UTC (rev 3281) @@ -68,9 +68,14 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> +  <dependency> <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -0,0 +1,35 @@ +package org.chorem.pollen.services; + +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.services.exceptions.FavoriteListImportException; +import org.chorem.pollen.services.impl.FavoriteListImportCSV; +import org.chorem.pollen.services.impl.FavoriteListImportLDAP; + +import java.util.List; + +/** + * Used to import a favorite List or a List of {@link PollAccount} from a given + * source url (file, external service, ...) + * + * Created: 16/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + * @see FavoriteListImportLDAP + * @see FavoriteListImportCSV + */ +public interface FavoriteListImport { + + /** + * Execute the import from given {@code url}. This will returned the + * successful list of {@link PollAccount} instanciated during import. No + * database save is done here, only the extraction from an input url to + * a list of entities to manage. + * + * @param url Url of the file or service that contains data to import + * @return the List of PollAccount imported + * @throws FavoriteListImportException for any import error + */ + public List<PollAccount> execute(String url) + throws FavoriteListImportException; +} Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServicePredicates.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -0,0 +1,30 @@ +package org.chorem.pollen.services; + +import com.google.common.base.Predicate; +import org.apache.commons.lang3.StringUtils; +import org.chorem.pollen.business.persistence.PollAccount; + +/** + * Created: 16/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public final class PollenServicePredicates { + + private PollenServicePredicates() { + // never instanciate a class with static methods + } + + /** + * Check if the PollAccount is empty, i.e. has empty votingId or email. + */ + public static final Predicate<PollAccount> POLL_ACCOUNT_NOT_EMPTY = new Predicate<PollAccount>() { + + @Override + public boolean apply(PollAccount input) { + String votingId = input.getVotingId(); + String email = input.getEmail(); + return StringUtils.isNotBlank(votingId) && StringUtils.isNotBlank(email); + } + }; +} Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -0,0 +1,83 @@ +/* *##% Pollen + * Copyright (C) 2010 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 + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY 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/>. ##%*/ + +package org.chorem.pollen.services.exceptions; + +import org.chorem.pollen.services.FavoriteListImport; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.n_; + +/** + * Exception during {@link FavoriteListImport#execute(String)} error. There is + * always a cause from librairies used for import. + * + * @author fdesbois <desbois(a)codelutin.com> + */ +public class FavoriteListImportException extends Exception { + + private static final long serialVersionUID = 1L; + + private static final String I18N_KEY = n_("pollen.error.import"); + + private String importName; + + private String causeMessage; + + public FavoriteListImportException(String importName, String causeMessage, Throwable cause) { + super(_(I18N_KEY, importName, causeMessage), cause); + this.importName = importName; + this.causeMessage = causeMessage; + } + + public FavoriteListImportException(String importName, Throwable cause) { + this(importName, cause.getMessage(), cause); + } + + /** + * @return the name of import (CSV, LDAP, ...) + */ + public String getImportName() { + return importName; + } + + /** + * @return the error message source from import execution. + */ + public String getCauseMessage() { + return causeMessage; + } + + /** + * Get the message depends on {@code locale}. + * + * @param locale Locale to translate the message + * @return the localized message or default one if locale is null + */ + public String getLocalizedMessage(Locale locale) { + String result; + if (locale == null) { + result = getMessage(); + + } else { + result = l_(locale, I18N_KEY, getImportName(), getCauseMessage()); + } + return result; + } +} Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -0,0 +1,162 @@ +package org.chorem.pollen.services.impl; + +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import org.apache.commons.io.IOUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.services.FavoriteListImport; +import org.chorem.pollen.services.PollenServicePredicates; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.FavoriteListImportException; +import org.nuiton.util.StringUtil; +import org.nuiton.util.csv.Import; +import org.nuiton.util.csv.ImportModel; +import org.nuiton.util.csv.ImportRuntimeException; +import org.nuiton.util.csv.ImportableColumn; +import org.nuiton.util.csv.ModelBuilder; +import org.nuiton.util.csv.ValueParser; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.Reader; +import java.text.ParseException; +import java.util.List; + +import static org.nuiton.i18n.I18n._; + +/** + * Implementation of {@link FavoriteListImport} as a service for CSV import. + * Nuiton-CSV is used to manage the {@link Import} using a specific {@link + * ImportModel} for pollen. Empty rows (no votingId or no email) are ignored. + * + * Created: 16/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class FavoriteListImportCSV extends PollenServiceSupport implements FavoriteListImport { + + private static final Log log = LogFactory.getLog(FavoriteListImportCSV.class); + + private static final ValueParser<String> EMAIL_PARSER = new ValueParser<String>() { + + @Override + public String parse(String value) throws ParseException { + if (value != null && !StringUtil.isEmail(value)) { + throw new ParseException(_("pollen.error.email.invalid"), 0); + } + return value; + } + }; + + protected class FavoriteListImportModel implements ImportModel<PollAccount> { + + @Override + public char getSeparator() { + return ','; + } + + @Override + public void pushCsvHeaderNames(List<String> headerNames) { + } + + @Override + public PollAccount newEmptyInstance() { + return newInstance(getDAO(PollAccount.class)); + } + + @Override + public Iterable<ImportableColumn<PollAccount, Object>> getColumnsForImport() { + ModelBuilder modelBuilder = new ModelBuilder(); + modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_VOTING_ID, + PollAccount.PROPERTY_VOTING_ID); + modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_EMAIL, + PollAccount.PROPERTY_EMAIL, + EMAIL_PARSER); + return modelBuilder.getColumnsForImport(); + } + } + + @Override + public List<PollAccount> execute(String url) throws FavoriteListImportException { + + List<PollAccount> results; + Reader reader = null; + try { + reader = new FileReader(new File(url)); + + Import<PollAccount> csvImport = Import.newImport(new FavoriteListImportModel(), reader); + + // Filter on empty account (without email or votingId) + results = Lists.newArrayList( + Iterables.filter(csvImport, + PollenServicePredicates.POLL_ACCOUNT_NOT_EMPTY) + ); + + if (log.isInfoEnabled()) { + log.info(results.size() + " comptes importés."); + } + + } catch (FileNotFoundException ex) { + throw new PollenTechnicalException(ex); + + } catch (ImportRuntimeException ex) { + if (log.isDebugEnabled()) { + log.debug("Error during CSV import", ex); + } + throw new FavoriteListImportException("CSV", ex); + + } finally { + IOUtils.closeQuietly(reader); + } + return results; + } + +// @Override +// public List<PollAccount> execute(String url) throws FavoriteListImportException { +// +// List<PollAccount> results; +// Reader reader = null; +// try { +// reader = new FileReader(new File(url)); +// +// // Définition de la stratégie de mapping +// ColumnPositionMappingStrategy<PollAccountImpl> strat = +// new ColumnPositionMappingStrategy<PollAccountImpl>(); +// +// String[] columns = new String[] { +// PollAccount.PROPERTY_VOTING_ID, +// PollAccount.PROPERTY_EMAIL +// }; +// +// strat.setType(PollAccountImpl.class); +// strat.setColumnMapping(columns); +// +// // Parsing du fichier CSV +// CsvToBean<PollAccountImpl> csv = new CsvToBean<PollAccountImpl>(); +// List<PollAccount> importedData = Lists.<PollAccount>newArrayList(csv.parse(strat, reader)); +// +// // Suppression des comptes null +// results = Lists.newArrayList( +// Iterables.filter(importedData, +// PollenServicePredicates.POLL_ACCOUNT_NOT_EMPTY) +// ); +// +// if (log.isInfoEnabled()) { +// log.info(results.size() + " comptes importés."); +// } +// +// } catch (Exception ex) { +// log.warn("Error during CSV import", ex); +// throw new FavoriteListImportException(ex); +// +// } finally { +// IOUtils.closeQuietly(reader); +// } +// return results; +// } +} Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -0,0 +1,99 @@ +package org.chorem.pollen.services.impl; + +import com.google.common.collect.Lists; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollAccountDAO; +import org.chorem.pollen.services.FavoriteListImport; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.services.exceptions.FavoriteListImportException; + +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; +import java.util.List; +import java.util.Properties; + +/** + * LDAP Import of {@link PollAccount}. The behavior is the same than the one + * from pollen 1.2.x + * + * TODO-fdesbois-2012-04-17 : tests and documentation + * + * Created: 16/04/12 + * + * @author fdesbois <desbois(a)codelutin.com> + * @since 1.3 + */ +public class FavoriteListImportLDAP extends PollenServiceSupport implements FavoriteListImport { + + private static final Log log = LogFactory.getLog(FavoriteListImportLDAP.class); + + @Override + public List<PollAccount> execute(String url) throws FavoriteListImportException { + + long start = System.nanoTime(); + + List<PollAccount> results = Lists.newArrayList(); + try { + + // Initialisation du contexte + Properties env = new Properties(); +// if (server != null) { +// env.put(Context.INITIAL_CONTEXT_FACTORY, +// "com.sun.jndi.ldap.LdapCtxFactory"); +// env.put(Context.PROVIDER_URL, "ldap://" + server + "/"); +// } + DirContext ictx = new InitialDirContext(env); + + // Recherche en profondeur + SearchControls control = new SearchControls(); + control.setSearchScope(SearchControls.SUBTREE_SCOPE); + + // Création des comptes avec les résultats de la recherche + NamingEnumeration<SearchResult> e = ictx.search(url, null, + control); + while (e.hasMore()) { + SearchResult r = e.next(); + + if (log.isDebugEnabled()) { + log.debug("Result: " + r.getName() + "(object: " + + r.getClassName() + ")"); + } + + Attribute nameAttr = r.getAttributes().get("cn"); + Attribute emailAttr = r.getAttributes().get("mail"); + + if (nameAttr != null) { + PollAccountDAO dao = getDAO(PollAccount.class); + PollAccount account = newInstance(dao); + account.setVotingId(nameAttr.get().toString()); + account.setEmail(emailAttr.get().toString()); + results.add(account); + + if (log.isDebugEnabled()) { + log.debug("New account - name: " + + nameAttr.get().toString() + ", email: " + + emailAttr.get().toString()); + } + } + } + } catch (NamingException ex) { + log.error("Exception de nommage lors de l'import depuis LDAP", ex); + throw new FavoriteListImportException("LDAP", ex); + } + + long duration = (System.nanoTime() - start) / 1000000000; + if (log.isInfoEnabled()) { + log.info(results.size() + " comptes importés en " + duration + + " sec."); + } + + return results; + } +} Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -124,8 +124,9 @@ } } - public void createFavoriteList(UserAccount user, - String name) throws FavoriteListAlreadyExistException, UserNotFoundException { + public PersonList createFavoriteList(UserAccount user, + String name) + throws FavoriteListAlreadyExistException, UserNotFoundException { Preconditions.checkNotNull(user); Preconditions.checkNotNull(name); @@ -135,7 +136,8 @@ UserAccountDAO userDAO = getDAO(UserAccount.class); PersonListDAO dao = getDAO(PersonList.class); - + + PersonList result; try { UserAccount userToUse = @@ -154,13 +156,14 @@ throw new FavoriteListAlreadyExistException(); } - PersonList favoriteListCreated = dao.create( + result = dao.create( PersonList.PROPERTY_OWNER, userToUse ); - favoriteListCreated.setName(name); + result.setName(name); } catch (TopiaException e) { throw new PollenTechnicalException(e); } + return result; } public PersonList deleteFavoriteList(UserAccount user, Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-04-17 13:08:52 UTC (rev 3281) @@ -20,6 +20,8 @@ pollen.email.voteEmail.subject=[Pollen] Vote reporting (%s) pollen.email.votingEmail.content=A new poll has been created\: "%s".\nYou can participate with the identifier %s by following this link\: \n%s pollen.email.votingEmail.subject=[Pollen] Invitation to vote (%s) +pollen.error.email.invalid=The email doesn't have the good format +pollen.error.import=Error during %1$s import \: %2$s pollen.feed.addChoiceContent= pollen.feed.addChoiceTitle= pollen.feed.addCommentContent=%s Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-04-17 13:08:52 UTC (rev 3281) @@ -22,6 +22,8 @@ pollen.email.voteEmail.subject=[Pollen] Notification de vote (%s) pollen.email.votingEmail.content=Un nouveau sondage a été créé \: "%s".\nVous pouvez y participer avec l'identifiant %s à l'adresse suivante \: \n%s pollen.email.votingEmail.subject=[Pollen] Invitation au vote (%s) +pollen.error.email.invalid=Email non valide +pollen.error.import=Erreur pendant l'import %1$s \: %2$s pollen.feed.addChoiceContent= pollen.feed.addChoiceTitle= pollen.feed.addCommentContent=%s Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -312,4 +312,10 @@ result.clear(); } } + + @Override + public boolean hasErrors() { + boolean result = super.hasErrors(); + return result || hasActionErrors(); + } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-04-17 13:08:52 UTC (rev 3281) @@ -24,13 +24,22 @@ package org.chorem.pollen.ui.actions.user; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.PersonList; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.services.FavoriteListImport; import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException; +import org.chorem.pollen.services.exceptions.FavoriteListImportException; +import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException; +import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; +import org.chorem.pollen.services.impl.FavoriteListImportCSV; +import org.chorem.pollen.services.impl.FavoriteListImportLDAP; import org.chorem.pollen.services.impl.FavoriteService; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import java.io.File; +import java.util.List; /** * Manage favorite lists of a connected user. @@ -53,6 +62,15 @@ protected String ldapImport; protected String action; + + private FavoriteService favoriteService; + + public FavoriteService getFavoriteService() { + if (favoriteService == null) { + favoriteService = newService(FavoriteService.class); + } + return favoriteService; + } public void setCsvImport(File csvImport) { this.csvImport = csvImport; @@ -100,11 +118,35 @@ Preconditions.checkNotNull(favoriteList); Preconditions.checkNotNull(favoriteList.getName()); - String result = INPUT; - FavoriteService service = newService(FavoriteService.class); try { - service.createFavoriteList(getPollenUserAccount(), - favoriteList.getName()); + PersonList personList = + getFavoriteService().createFavoriteList(getPollenUserAccount(), + favoriteList.getName()); + + if (csvImportFileName != null) { + + FavoriteListImport importService = newService(FavoriteListImportCSV.class); + + addImport(importService, csvImport.getAbsolutePath(), personList); + } + + if (StringUtils.isNotBlank(ldapImport)) { + + FavoriteListImport importService = newService(FavoriteListImportLDAP.class); + + addImport(importService, ldapImport, personList); + } + + } catch (FavoriteListAlreadyExistException ex) { + addFieldError("createFavoriteList.name", + _("pollen.error.favoriteList.already.used")); + } + + String result; + if (hasErrors()) { + result = INPUT; + + } else { getTransaction().commitTransaction(); addActionMessage(_("pollen.information.favoriteList.created", @@ -112,9 +154,6 @@ action = null; favoriteList = null; result = SUCCESS; - } catch (FavoriteListAlreadyExistException e) { - addFieldError("createFavoriteList.name", - _("pollen.error.favoriteList.already.used")); } return result; } @@ -123,10 +162,9 @@ Preconditions.checkNotNull(favoriteList); - FavoriteService service = newService(FavoriteService.class); - - PersonList deletedFavoritedList = service.deleteFavoriteList(getPollenUserAccount(), - favoriteList); + PersonList deletedFavoritedList = + getFavoriteService().deleteFavoriteList(getPollenUserAccount(), + favoriteList); getTransaction().commitTransaction(); addActionMessage(_("pollen.information.favoriteList.deleted", @@ -138,8 +176,34 @@ protected PersonList getFavoriteList() { if (favoriteList == null) { - favoriteList = newService(FavoriteService.class).newFavoriteList(); + favoriteList = getFavoriteService().newFavoriteList(); } return favoriteList; } + + protected void addImport(FavoriteListImport service, String url, PersonList list) + throws FavoriteListNotFoundException { + + List<PollAccount> importedAccounts; + try { + importedAccounts = service.execute(url); + + for (PollAccount importedAccount : importedAccounts) { + try { + getFavoriteService().addPollAccountToFavoriteList(list, importedAccount); + + } catch (ParticipantAlreadyFoundInListException ex) { + // WARNING ? + addActionError( + _("pollen.error.favoriteList.import.participantExists" + ,importedAccount.getVotingId()) + ); + } + } + + } catch (FavoriteListImportException ex) { + String message = ex.getLocalizedMessage(getLocale()); + addActionError(message); + } + } } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-17 13:08:52 UTC (rev 3281) @@ -128,6 +128,7 @@ pollen.error.email.invalid=The email doesn't have the good format pollen.error.email.required=You must provide an email pollen.error.favoriteList.already.used=List name already used +pollen.error.favoriteList.import.participantExists=The name '%1$s' is already used in the list 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 Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-17 13:08:52 UTC (rev 3281) @@ -135,6 +135,7 @@ pollen.error.email.invalid=Email non valide pollen.error.email.required=Email obligatoire pollen.error.favoriteList.already.used=Nom de liste déjà utilisé +pollen.error.favoriteList.import.participantExists=Le nom '%1$s' est déjà utilisé dans la liste 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 Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-04-17 13:08:52 UTC (rev 3281) @@ -76,7 +76,8 @@ <br/> <s:form id='createForm' method="POST" namespace="/user" - cssClass="hidden favoriteForm"> + cssClass="hidden favoriteForm" + enctype="multipart/form-data"> <s:hidden name="action" value="create"/> <fieldset> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-16 12:26:13 UTC (rev 3280) +++ trunk/pom.xml 2012-04-17 13:08:52 UTC (rev 3281) @@ -66,6 +66,12 @@ <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>${nuitonUtilsVersion}</version> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonUtilsVersion}</version> </dependency>

1 0

r3280 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user
by fdesbois＠users.chorem.org April 16, 2012

April 16, 2012

Author: fdesbois Date: 2012-04-16 14:26:13 +0200 (Mon, 16 Apr 2012) New Revision: 3280 Url: http://chorem.org/repositories/revision/pollen/3280 Log: fixes #514 : missing onclick action for cancel Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-16 12:23:57 UTC (rev 3279) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-16 12:26:13 UTC (rev 3280) @@ -41,7 +41,7 @@ <hr/> <div align="right"> - <button><s:text name="pollen.action.cancel"/></button> + <button onclick="return cancel();"><s:text name="pollen.action.cancel"/></button> <s:submit key="pollen.action.send" theme="simple" action="lostPassword"/> </div>

1 0

r3279 - in trunk/pollen-ui-struts2/src/main: resources/i18n webapp/WEB-INF/jsp/user
by fdesbois＠users.chorem.org April 16, 2012

April 16, 2012

Author: fdesbois Date: 2012-04-16 14:23:57 +0200 (Mon, 16 Apr 2012) New Revision: 3279 Url: http://chorem.org/repositories/revision/pollen/3279 Log: fixes #514 : change cancel submit to button. The send action need to be the default one for enter key. Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 11:57:48 UTC (rev 3278) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 12:23:57 UTC (rev 3279) @@ -195,6 +195,7 @@ pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. pollen.information.irreversible.operation=Be ware, this operation is irreversible. +pollen.information.lostPassword=You will receive a new password to the given email pollen.information.lostPassword.success=An e-mail was sent with your new password. You can change it on your user account page. pollen.information.need.login=You must be logged to access this page. Please fill the form below. pollen.information.poll.created=Poll created Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-16 11:57:48 UTC (rev 3278) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp 2012-04-16 12:23:57 UTC (rev 3279) @@ -41,8 +41,7 @@ <hr/> <div align="right"> - <s:submit onclick="return cancel();" theme="simple" - key="pollen.action.cancel"/> + <button><s:text name="pollen.action.cancel"/></button> <s:submit key="pollen.action.send" theme="simple" action="lostPassword"/> </div>

1 0

r3278 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll
by fdesbois＠users.chorem.org April 16, 2012

April 16, 2012

Author: fdesbois Date: 2012-04-16 13:57:48 +0200 (Mon, 16 Apr 2012) New Revision: 3278 Url: http://chorem.org/repositories/revision/pollen/3278 Log: fixes #513 : add poll title in page head Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-04-16 11:37:19 UTC (rev 3277) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-04-16 11:57:48 UTC (rev 3278) @@ -26,6 +26,8 @@ <%@ taglib prefix="sj" uri="/struts-jquery-tags" %> <%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %> +<title><s:property value="%{poll.title}"/></title> + <link rel="stylesheet" type="text/css" href="<s:url value='/css/vote.css'/>"/>

1 0

r3277 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user
by fdesbois＠users.chorem.org April 16, 2012

April 16, 2012

Author: fdesbois Date: 2012-04-16 13:37:19 +0200 (Mon, 16 Apr 2012) New Revision: 3277 Url: http://chorem.org/repositories/revision/pollen/3277 Log: fixes #512 : do not display names if not defined Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-04-16 11:26:38 UTC (rev 3276) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-04-16 11:37:19 UTC (rev 3277) @@ -41,8 +41,8 @@ <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" /> + <s:label name="user.firstName" value="%{user.firstName}" key="pollen.common.firstName" /> + <s:label name="user.lastName" value="%{user.lastName}" key="pollen.common.lastName" /> </fieldset> <br/> <s:submit action="edit" method="input"

1 0

r3276 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n resources/org/chorem/pollen/ui/actions/admin resources/org/chorem/pollen/ui/actions/user
by fdesbois＠users.chorem.org April 16, 2012

April 16, 2012

Author: fdesbois Date: 2012-04-16 13:26:38 +0200 (Mon, 16 Apr 2012) New Revision: 3276 Url: http://chorem.org/repositories/revision/pollen/3276 Log: fixes #511 : email validation + add missing translations Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-04-16 11:26:38 UTC (rev 3276) @@ -430,6 +430,13 @@ } } + String creatorEmail = poll.getCreator().getEmail(); + if (creatorEmail != null && !StringUtil.isEmail(creatorEmail)) { + + addOptionsError("poll.creator.email", + _("pollen.error.email.invalid")); + } + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { addOptionsError("poll.endChoiceDate", @@ -558,7 +565,7 @@ if (StringUtils.isEmpty(email)) { addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.email.required")); + _("pollen.error.email.required")); } else { @@ -568,7 +575,7 @@ // not a valid email addOptionsError( fieldNamePrefix, - _("pollen.error.poll.personToList.email.not.valid")); + _("pollen.error.email.invalid")); } else { // check email not doublon Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-04-16 11:26:38 UTC (rev 3276) @@ -125,6 +125,7 @@ pollen.error.choice.empty=%s mandatory pollen.error.comment.name.empty=Comment name mandatory pollen.error.comment.text.empty=Comment text mandatory +pollen.error.email.invalid=The email doesn't have the good format 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 @@ -133,7 +134,7 @@ 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.lostPassword.email=The provided e-mail is not valid. +pollen.error.lostPassword.email=The provided e-mail is not valid pollen.error.lostPassword.user=No user matches the given e-mail pollen.error.no.poll.found=Poll not found with id %s pollen.error.password.required=Your must provide a password @@ -144,18 +145,15 @@ pollen.error.poll.endChoiceDate.before.beginChoiceDate=The choice end date must be later than the begin date. pollen.error.poll.endDate.before.beginDate=The poll end date must be later than the begin date. pollen.error.poll.notfound=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.error.poll.personToList.email.doublon= -pollen.error.poll.personToList.email.not.valid= -pollen.error.poll.personToList.email.required= -pollen.error.poll.personToList.votingId.doublon= -pollen.error.poll.personToList.weight.not.valid= -pollen.error.poll.required.one.choice=You must provide at least one choice. -pollen.error.poll.required.one.personToList= +pollen.error.poll.personToList.email.doublon=Email must be unique +pollen.error.poll.personToList.votingId.doublon=The voter's name must be unique +pollen.error.poll.personToList.weight.not.valid=The voter's weight is not valid (must be greater than 0) +pollen.error.poll.required.one.choice=You must provide at least one choice +pollen.error.poll.required.one.personToList=You must provide at least one voter pollen.error.poll.required.title=You must provide a title for the poll -pollen.error.poll.required.votingList.name= -pollen.error.poll.votingList.name.doublon= -pollen.error.poll.votingList.weight.not.valid= -pollen.error.pollAccount.email.required=Em@il mandatory +pollen.error.poll.required.votingList.name=The group's name is mandatory +pollen.error.poll.votingList.name.doublon=The group's name must be unique +pollen.error.poll.votingList.weight.not.valid=The group's weight is not valid (must be greater than 0) pollen.error.pollAccount.not.found=Poll account not found pollen.error.pollAccount.votingId.required=Name mandatory pollen.error.pollNotClosed=The poll is not closed. Results may change. @@ -237,6 +235,8 @@ pollen.menu.preferences=My account pollen.menu.register=Register pollen.menu.userFavoriteLists=Voting lists +pollen.tab.poll.general=Informations +pollen.tab.poll.options=Options pollen.title.clone.poll=Clone a poll pollen.title.close.poll=Close a poll pollen.title.createPoll=New poll Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-04-16 11:26:38 UTC (rev 3276) @@ -132,7 +132,8 @@ pollen.error.choice.empty=%s obligatoire pollen.error.comment.name.empty=Nom du commentaire obligatoire pollen.error.comment.text.empty=Texte du commentaire obligatoire -pollen.error.email.required=Courriel obligatoire +pollen.error.email.invalid=Email non valide +pollen.error.email.required=Email 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 @@ -152,8 +153,6 @@ pollen.error.poll.endDate.before.beginDate=La date de fin du sondage doit-être postérieure à la date de début. pollen.error.poll.notfound=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.error.poll.personToList.email.doublon=Les emails doivent être uniques. -pollen.error.poll.personToList.email.not.valid=Email non valide -pollen.error.poll.personToList.email.required=Email obligatoire pollen.error.poll.personToList.votingId.doublon=Les noms des votants doivent être uniques. pollen.error.poll.personToList.weight.not.valid=Poids du votant non valide (doit être une nombre supérieur à 0). pollen.error.poll.required.one.choice=Vous devez saisir au moins un choix. @@ -162,7 +161,6 @@ pollen.error.poll.required.votingList.name=nom du groupe non renseigné pollen.error.poll.votingList.name.doublon=Les noms de groupes doivent être uniques. pollen.error.poll.votingList.weight.not.valid=Poids du groupe votant non valide (doit être une nombre supérieur à 0). -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.pollNotClosed=Ce sondage n'est pas clos. Les résultats peuvent encore changer. Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -39,6 +39,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -39,6 +39,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -55,6 +55,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -40,9 +40,13 @@ <field name="createPollAccount.email"> <field-validator type="requiredstring"> - <message key="pollen.error.pollAccount.email.required"/> + <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -43,6 +43,10 @@ <message key="pollen.error.pollAccount.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators> \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-04-16 11:26:30 UTC (rev 3275) +++ trunk/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-04-16 11:26:38 UTC (rev 3276) @@ -59,6 +59,10 @@ <message key="pollen.error.email.required"/> </field-validator> + <field-validator type="email"> + <message key="pollen.error.email.invalid"/> + </field-validator> + </field> </validators>

1 0

r3275 - trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl
by fdesbois＠users.chorem.org April 16, 2012

April 16, 2012

Author: fdesbois Date: 2012-04-16 13:26:30 +0200 (Mon, 16 Apr 2012) New Revision: 3275 Url: http://chorem.org/repositories/revision/pollen/3275 Log: improve assertion for email Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 18:14:05 UTC (rev 3274) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-16 11:26:30 UTC (rev 3275) @@ -117,19 +117,23 @@ // ---- VERIFY ---- // PollenEmail result = emailQueue.readEmail(); - Assert.assertEquals("bob(a)toto.fr", result.getTo()); - - // TODO-fdesbois-2012-04-13 : check email subject and content + assertEmail("bob(a)toto.fr", result); UserAccount userUpdated = getEntityById(UserAccount.class, userId); Assert.assertNotNull(userUpdated); String encodedPassword = userService.encodePassword("password"); Assert.assertEquals(encodedPassword, userUpdated.getPassword()); } + + protected void assertEmail(String to, PollenEmail email) { + Assert.assertEquals(to, email.getTo()); + Assert.assertFalse(email.getContent().contains("null")); + Assert.assertFalse(email.getSubject().contains("null")); + } /** - * Mock to avoid sending emails. It uses a queue instead to allow tests - * to retrieve emails and check them. Use {@link #readEmail()} to read + * Mock to avoid sending emails. It uses a queue instead of smtp to allow + * tests to retrieve emails and check them. Use {@link #readEmail()} to read * the current email (FIFO). */ public class EmailServiceQueueMock extends EmailService {

1 0

r3274 - in trunk/pollen-services/src/test/java/org/chorem/pollen/services: . impl
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 20:14:05 +0200 (Fri, 13 Apr 2012) New Revision: 3274 Url: http://chorem.org/repositories/revision/pollen/3274 Log: add test for lostPassword Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-04-13 17:56:05 UTC (rev 3273) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-04-13 18:14:05 UTC (rev 3274) @@ -23,9 +23,12 @@ */ package org.chorem.pollen.services; +import com.google.common.collect.Maps; import org.junit.Before; import org.junit.Rule; +import java.util.Map; + /** * 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 @@ -33,20 +36,55 @@ * 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. + * {@link #newService(Class)} to get a service ready to be used. + * + * @since 1.3 */ public abstract class AbstractPollenServiceTest extends PollenServiceSupport { @Rule public FakeServiceContext fakeContext = new FakeServiceContext(); + + protected PollenServiceMockFactory serviceFactory; @Before public void setUp() throws Exception { - getServiceContext().setServiceFactory(new PollenServiceFactory()); + serviceFactory = new PollenServiceMockFactory(); + getServiceContext().setServiceFactory(serviceFactory); setServiceContext(getServiceContext()); } public FakeServiceContext getServiceContext() { return fakeContext; } + + /** + * Mock for {@link PollenServiceMockFactory}. You can use + * {@link #registerService(Class, PollenService)} to set an explicit + * instance for one of the service used. the {@link PollenServiceContext} + * will be set to the instance each time the {@link #newService(Class, + * PollenServiceContext)} is requested. + */ + protected class PollenServiceMockFactory extends PollenServiceFactory { + + private Map<Class<? extends PollenService>, PollenService> services = Maps.newHashMap(); + + public <E extends PollenService> void registerService(Class<E> clazz, E instance) { + services.put(clazz, instance); + } + + @Override + public <E extends PollenService> E newService(Class<E> clazz, PollenServiceContext serviceContext) { + + E result; + if (services.containsKey(clazz)) { + result = (E) services.get(clazz); + result.setServiceContext(serviceContext); + + } else { + result = super.newService(clazz, serviceContext); + } + return result; + } + } } Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-04-13 17:56:05 UTC (rev 3273) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-04-13 18:14:05 UTC (rev 3274) @@ -28,7 +28,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PolleIOUtil; import org.chorem.pollen.PollenConfiguration; -import org.chorem.pollen.PollenConfigurationOption; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -66,6 +65,8 @@ protected Date fakeCurrentTime; protected File testDir; + + protected URL applicationUrl; public TopiaContext getRootContext() { return this.rootContext; @@ -148,9 +149,13 @@ @Override public URL getApplicationURL() { - return null; + return applicationUrl; } + public void setApplicationUrl(URL applicationUrl) { + this.applicationUrl = applicationUrl; + } + /** * Create an id to easily managed polls using urls. * Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 17:56:05 UTC (rev 3273) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-04-13 18:14:05 UTC (rev 3274) @@ -23,18 +23,25 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.collect.Queues; +import org.chorem.pollen.business.persistence.UserAccount; +import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.junit.Assert; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; +import java.net.URL; +import java.util.Queue; + +import static org.chorem.pollen.services.impl.EmailService.PollenEmail; + /** * Tests the {@link UserService}. * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 */ -@Ignore public class UserServiceTest extends AbstractPollenServiceTest { @Override @@ -80,4 +87,79 @@ public void testGetNbUsers() throws Exception { } + + @Test + public void testLostPassword() throws Exception { + + // ---- PREPARE ---- // + + // mock service for email that don't send them through smtp but keep them + EmailServiceQueueMock emailQueue = new EmailServiceQueueMock(); + getServiceContext().setApplicationUrl(new URL("http", "test", "pollen")); + serviceFactory.registerService(EmailService.class, emailQueue); + + // need to force the generated password + serviceFactory.registerService(UserService.class, + new UserServiceGeneratePasswordMock("password")); + + // Create a user + UserAccountDAO userAccountDAO = getDAO(UserAccount.class); + UserAccount user = create(userAccountDAO); + user.setEmail("bob(a)toto.fr"); + user.setLogin("login"); + user.setPassword("none"); + commitTransaction("can't create user"); + String userId = user.getTopiaId(); + + // ---- EXECUTE ---- // + UserService userService = serviceFactory.newService(UserService.class, getServiceContext()); + userService.lostPassword("bob(a)toto.fr"); + + // ---- VERIFY ---- // + PollenEmail result = emailQueue.readEmail(); + Assert.assertEquals("bob(a)toto.fr", result.getTo()); + + // TODO-fdesbois-2012-04-13 : check email subject and content + + UserAccount userUpdated = getEntityById(UserAccount.class, userId); + Assert.assertNotNull(userUpdated); + String encodedPassword = userService.encodePassword("password"); + Assert.assertEquals(encodedPassword, userUpdated.getPassword()); + } + + /** + * Mock to avoid sending emails. It uses a queue instead to allow tests + * to retrieve emails and check them. Use {@link #readEmail()} to read + * the current email (FIFO). + */ + public class EmailServiceQueueMock extends EmailService { + + protected Queue<PollenEmail> emailQueue = Queues.newPriorityQueue(); + + @Override + protected void sendEmail(PollenEmail pollenEmail) { + emailQueue.add(pollenEmail); + } + + public PollenEmail readEmail() { + return emailQueue.poll(); + } + } + + /** + * Mock to force using a static password instead of generating a random one. + */ + protected class UserServiceGeneratePasswordMock extends UserService { + + private String password; + + public UserServiceGeneratePasswordMock(String password) { + this.password = password; + } + + @Override + protected String generatePassword() { + return password; + } + } }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →