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

r3669 - trunk
by tchemit＠users.chorem.org 30 Aug '12

30 Aug '12

Author: tchemit Date: 2012-08-30 16:45:28 +0200 (Thu, 30 Aug 2012) New Revision: 3669 Url: http://chorem.org/repositories/revision/pollen/3669 Log: Update mavenpom4redmine to 3.3.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-29 16:03:56 UTC (rev 3668) +++ trunk/pom.xml 2012-08-30 14:45:28 UTC (rev 3669) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.7-SNAPSHOT</version> + <version>3.3.7</version> </parent> <groupId>org.chorem</groupId>

1 0

r3668 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll/vote resources resources/i18n
by tchemit＠users.chorem.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 18:03:56 +0200 (Wed, 29 Aug 2012) New Revision: 3668 Url: http://chorem.org/repositories/revision/pollen/3668 Log: fixes #798: Errorneous submit makes 'number' poll submission fail Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.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/shiro.ini Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-29 15:28:07 UTC (rev 3667) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-29 16:03:56 UTC (rev 3668) @@ -112,10 +112,28 @@ VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); boolean voteValid = true; + int voteNumber = 0; for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { Integer value = voteToChoice.getVoteValue(); + if (value==null) { + + // check value if same as the one return by request + // otherwise it means there is a conversion error + String[] values = getParameters().get("vote.choiceVoteToChoice[" + voteNumber + "].voteValue"); + String paramValue = values==null || values.length<1?null:values[0]; + + if (StringUtils.isNotBlank(paramValue)) { + + // vote value changed + String validMessage = + _("pollen.error.vote.invalidFormat", paramValue); + addFieldError("vote.choices", validMessage); + voteValid = false; + break; + } + } // check if vote is null ? boolean voteNull = strategy.isVoteValueNull(value); 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-08-29 15:28:07 UTC (rev 3667) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-08-29 16:03:56 UTC (rev 3668) @@ -232,6 +232,7 @@ pollen.error.user.restrictedListsForbidden=The poll is restricted and you are not allowed to vote. Check if you have correctly used the link sent to you by email. pollen.error.userNotAllowed=You are not allowed to count the votes for this poll. pollen.error.vote.invalidCondorcetVoteValue=Invalid position\: in a condorcet vote, you can let empty values, or put values greater than zero. +pollen.error.vote.invalidFormat=Vote value invalid (must be a integer number) pollen.error.vote.maxChoiceNb=The maximal number of choices is %d. pollen.error.vote.percentage=The sum of the values must be equals to 100. pollen.fieldset.choice.options=Choices 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-08-29 15:28:07 UTC (rev 3667) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-08-29 16:03:56 UTC (rev 3668) @@ -233,6 +233,7 @@ pollen.error.user.restrictedListsForbidden=Le sondage est restreint et vous n'êtes pas autorisé à voter. Vérifiez que vous avez bien utiliser le lien qui vous a été envoyé. pollen.error.userNotAllowed=Vous n'êtes pas autorisé à dépouiller ce sondage. pollen.error.vote.invalidCondorcetVoteValue=Position invalide \: dans un vote condorcet, vous pouvez soit laisser laisser vide un choix, soit mettre une valeur strictement positive. +pollen.error.vote.invalidFormat=Valeur de vote %s invalide (doit être un nombre entier) pollen.error.vote.maxChoiceNb=Le nombre de choix maximal est de %d. pollen.error.vote.percentage=La somme des valeurs doit être égale à 100. pollen.fieldset.choice.options=Les choix Modified: trunk/pollen-ui-struts2/src/main/resources/shiro.ini =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-08-29 15:28:07 UTC (rev 3667) +++ trunk/pollen-ui-struts2/src/main/resources/shiro.ini 2012-08-29 16:03:56 UTC (rev 3668) @@ -65,6 +65,7 @@ /json/getPolls=connected,admin # is poll exists and user can vote to it +/poll/vote/**=pollVoteAccess /poll/votefor/**=pollVoteAccess /poll/VoteFor/**=pollVoteAccess /poll/addChoice/**=pollVoteAccess

1 0

r3667 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin
by tchemit＠users.chorem.org 29 Aug '12

29 Aug '12

Author: tchemit Date: 2012-08-29 17:28:07 +0200 (Wed, 29 Aug 2012) New Revision: 3667 Url: http://chorem.org/repositories/revision/pollen/3667 Log: can not edit user email for the moemnt (see #796) + fix NPE when user update his account Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-08-28 20:43:45 UTC (rev 3666) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-08-29 15:28:07 UTC (rev 3667) @@ -112,7 +112,7 @@ UserAccount.PROPERTY_PASSWORD, encodedPassword ); user.setTopiaId(userAccount.getTopiaId()); - copyUserAccount(user, userAccount); + copyUserAccount(user, userAccount, true); commitTransaction("Could not create user"); @@ -176,14 +176,17 @@ } // In case of email change, check if an other user has not already - // the new email - // existing user found - if (ObjectUtils.notEqual(user.getEmail(), userToUpdate.getEmail()) + // the new email existing user found + //FIXME-tchemit-2012-08_29 Voir http://chorem.org/issues/796 + String oldEmail = userToUpdate.getEmail(); + if (StringUtils.isNotBlank(user.getEmail()) && + ObjectUtils.notEqual(user.getEmail(), oldEmail) && dao.isUserExist(user)) { throw new UserEmailAlreadyUsedException(); } - copyUserAccount(user, userToUpdate); + //FIXME-tchemit-2012-08_29 Voir http://chorem.org/issues/796 + copyUserAccount(user, userToUpdate, false); commitTransaction("Could not update user"); return userToUpdate; @@ -254,7 +257,7 @@ } dao.delete(user); - commitTransaction("Could not delete user "+id); + commitTransaction("Could not delete user " + id); } catch (TopiaException e) { throw new PollenTechnicalException(e); } @@ -324,7 +327,8 @@ * @see Binder#copy(Object, Object, String...) */ protected void copyUserAccount(UserAccount source, - UserAccount destination) { + UserAccount destination, + boolean copyEmail) { TopiaEntityBinder<UserAccount> binder = PollenBinderHelper.getSimpleTopiaBinder(UserAccount.class); @@ -334,8 +338,10 @@ UserAccount.PROPERTY_FIRST_NAME, UserAccount.PROPERTY_LAST_NAME); - // Don't keep case for email - destination.setEmail(StringUtils.lowerCase(source.getEmail())); + if (copyEmail) { + // Don't keep case for email + destination.setEmail(StringUtils.lowerCase(source.getEmail())); + } } } Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-08-28 20:43:45 UTC (rev 3666) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-08-29 15:28:07 UTC (rev 3667) @@ -116,7 +116,7 @@ <s:textfield key="editUser.login" label="%{getText('pollen.common.login')}" required="true" readonly="true" size="40"/> <s:textfield key="editUser.email" label="%{getText('pollen.common.email')}" - required="true" size="40" disabled="%{exists}"/> + required="true" size="40" disabled="true"/> <s:textfield key="editUser.firstName" label="%{getText('pollen.common.firstName')}" size="40"/> <s:textfield key="editUser.lastName"

1 0

r3666 - trunk
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 22:43:45 +0200 (Tue, 28 Aug 2012) New Revision: 3666 Url: http://chorem.org/repositories/revision/pollen/3666 Log: updates to mavenpom 3.3.7-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-28 20:31:08 UTC (rev 3665) +++ trunk/pom.xml 2012-08-28 20:43:45 UTC (rev 3666) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.6</version> + <version>3.3.7-SNAPSHOT</version> </parent> <groupId>org.chorem</groupId>

1 0

r3665 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 22:31:08 +0200 (Tue, 28 Aug 2012) New Revision: 3665 Url: http://chorem.org/repositories/revision/pollen/3665 Log: fix invoker version Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-08-28 20:24:07 UTC (rev 3664) +++ trunk/pollen-ui-struts2/pom.xml 2012-08-28 20:31:08 UTC (rev 3665) @@ -608,7 +608,6 @@ <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> - <version>${invokerPluginVersion}</version> <configuration> <localRepositoryPath> ${project.build.directory}/it-repo @@ -641,6 +640,7 @@ <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> + <version>${invokerPluginVersion}</version> </plugin> </plugins> </reporting>

1 0

r3664 - trunk/pollen-votecounting-strategy
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 22:24:07 +0200 (Tue, 28 Aug 2012) New Revision: 3664 Url: http://chorem.org/repositories/revision/pollen/3664 Log: fix license Modified: trunk/pollen-votecounting-strategy/LICENSE.txt Modified: trunk/pollen-votecounting-strategy/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-strategy/LICENSE.txt 2012-08-28 20:16:54 UTC (rev 3663) +++ trunk/pollen-votecounting-strategy/LICENSE.txt 2012-08-28 20:24:07 UTC (rev 3664) @@ -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

1 0

r3663 - in trunk: pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it pollen-votecounting-strategy-borda pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy pollen-votecounting-strategy-condorcet pollen-votecounting-strategy-coombs pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy pollen-votecounting-strategy-coombs/src/test/re
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 22:16:54 +0200 (Tue, 28 Aug 2012) New Revision: 3663 Url: http://chorem.org/repositories/revision/pollen/3663 Log: fix dependencies + remove some logging (for the moment) in strategies Removed: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java trunk/pollen-votecounting-strategy-borda/pom.xml trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java trunk/pollen-votecounting-strategy-instant-runoff/pom.xml trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java trunk/pollen-votecounting-strategy-normal/pom.xml trunk/pollen-votecounting-strategy-number/pom.xml trunk/pollen-votecounting-strategy-percentage/pom.xml Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 20:16:54 UTC (rev 3663) @@ -22,7 +22,7 @@ * #L% */ -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java 2012-08-28 20:16:54 UTC (rev 3663) @@ -25,7 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.rules.TestWatcher; Modified: trunk/pollen-votecounting-strategy-borda/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-borda/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-borda/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -29,24 +29,18 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java 2012-08-28 20:16:54 UTC (rev 3663) @@ -121,6 +121,10 @@ // nb of choices int nbChoices = resultByChoice.keySet().size(); + if (log.isDebugEnabled()) { + log.debug("Nb choices: " + nbChoices); + } + // calcul pour chaque votant de sa liste des choix dans son ordre préféré Map<Voter, List<Set<String>>> voterSortedChoices = Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -37,16 +37,8 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -26,27 +26,21 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java 2012-08-28 20:16:54 UTC (rev 3663) @@ -26,8 +26,6 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; import org.chorem.pollen.votecounting.model.VoteCountingResult; @@ -54,9 +52,6 @@ public static final int ID = 6; - /** Logger. */ - private static final Log log = LogFactory.getLog(CoombsStrategy.class); - @Override public int getId() { return ID; Deleted: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-08-28 20:16:54 UTC (rev 3663) @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Condorcet -# $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... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO Modified: trunk/pollen-votecounting-strategy-instant-runoff/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-instant-runoff/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -26,27 +26,21 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java 2012-08-28 20:16:54 UTC (rev 3663) @@ -25,8 +25,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; import org.chorem.pollen.votecounting.model.VoteCountingResult; @@ -53,11 +51,6 @@ public static final int ID = 5; - /** Logger. */ - private static final Log log = - LogFactory.getLog(InstantRunoffStrategy.class); - - @Override public int getId() { return ID; Deleted: trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/test/resources/log4j.properties 2012-08-28 20:16:54 UTC (rev 3663) @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Condorcet -# $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... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO Modified: trunk/pollen-votecounting-strategy-normal/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-normal/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-normal/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -26,10 +26,6 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -37,12 +33,8 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Deleted: trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-normal/src/test/resources/log4j.properties 2012-08-28 20:16:54 UTC (rev 3663) @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Normal -# $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... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO Modified: trunk/pollen-votecounting-strategy-number/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-number/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-number/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -26,10 +26,6 @@ </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -37,12 +33,8 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Deleted: trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-number/src/test/resources/log4j.properties 2012-08-28 20:16:54 UTC (rev 3663) @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Number -# $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... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO Modified: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-08-28 20:16:54 UTC (rev 3663) @@ -25,10 +25,10 @@ <version>${project.version}</version> </dependency> - <dependency> +  <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> Deleted: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-08-28 20:00:51 UTC (rev 3662) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-08-28 20:16:54 UTC (rev 3663) @@ -1,30 +0,0 @@ -### -# #%L -# Pollen :: VoteCounting strategy :: Percentage -# $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... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n -# package level -log4j.logger.org.chorem.pollen=INFO

1 0

r3662 - in trunk/pollen-ui-struts2: . src/it/createPoll/src/test/java/org/chorem/pollen/ui/it src/it/pollCommentVisibility src/it/pollCommentVisibility/src/jetty src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it src/it/pollCommentVisibility/src/test/resources/data/db src/it/pollCommentVisibility/src/test/resources/data/feeds src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll src/it/pollVot
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 22:00:51 +0200 (Tue, 28 Aug 2012) New Revision: 3662 Url: http://chorem.org/repositories/revision/pollen/3662 Log: - add invoker report version - add missing svn properties and license header - fix security it build Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/LICENSE.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/changelog.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/0a96604ee43e45e7b9bff495f0d1be7c.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/1cfa579292c94bf68eea76da5c7dcc54.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/231a34e880d4447bbd9247cf6fb08239.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3442086a6b7b4ba48b6431099f61e12a.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3e0c927b3930498195a9da90dd003ff1.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4bcf02e9758a4e6689f7b9536e8d1414.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4ff1aff69b234ed8af88889b2a8334ce.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/5ae795551aa34f1192d761885b9cc7ac.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/63145d6ae2f34f29b18ca4d2ce1eea6f.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/69b8aec17ae5416082666b51debdeb3e.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/6ba21b17a8ee4fe3acc2b33d971067fd.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/732d3bd4825b49efae7e4af5de9e1536.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7d1d828b24e9450fa346321b32a1d463.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/80f4369d988a40e89b200e22e22e3a52.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8b781e56d4d545db82b2dc301a32a7de.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8d904a3490e94ef2a4368b62afc83402.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a13d4759209a4b919c4a63ee2a0003dc.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/ac92041cf86f4bf9b3b5accfdd63330b.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/aeff6e804f244b1c8e78fec93262c50f.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b38d0d680fb84ea891c2dd0bf4698a1f.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c19ba513378b4c63873f6948bbf3dc72.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c672a1f964904c769fcb2235de46bafa.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c881d4c8f8a74a2198d292d05489097a.xml trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e4fccb937a0b4bf1a008d17c1234ce45.xml trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/test/resources/emptydbWithUsers.h2.db trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -608,6 +608,7 @@ <plugins> <plugin> <artifactId>maven-invoker-plugin</artifactId> + <version>${invokerPluginVersion}</version> <configuration> <localRepositoryPath> ${project.build.directory}/it-repo Modified: trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.junit.runner.RunWith; import org.junit.runners.Suite; Property changes on: trunk/pollen-ui-struts2/src/it/createPoll/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/goals.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -3,7 +3,7 @@ #%L Pollen :: UI (struts2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/it/pollVoteVis… $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -3,7 +3,7 @@ #%L Pollen :: UI (struts2) $Id$ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/it/pollVoteVis… $ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/jetty/jetty-context.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.apache.commons.lang.StringUtils; import org.junit.Assert; Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.junit.Assert; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.junit.runner.RunWith; import org.junit.runners.Suite; Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : poll with no comment</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/5b7d6a90540f4173bfb8d60778ef6dd9" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : pollWithComments</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/6de9197bda3b4f908cf047a48ea50395" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.freepoll.FreePollTestSuite; import org.chorem.pollen.ui.it.restrictedpoll.RestrictedPollTestSuite; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.freepoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.junit.runner.RunWith; import org.junit.runners.Suite; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/FreePollTestSuite.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.freepoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ /** * To test on free poll. * Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/freepoll/java-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -3,7 +3,7 @@ * #%L * Pollen :: UI (struts2) * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/it/pollVoteVis… $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByAdminIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -3,7 +3,7 @@ * #%L * Pollen :: UI (struts2) * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/it/pollVoteVis… $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -3,7 +3,7 @@ * #%L * Pollen :: UI (struts2) * $Id$ - * $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/it/pollVoteVis… $ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/AnonymousPollByNotConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByAdminIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/CreatorOnlyByNotConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByAdminIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/EverybodyByNotConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.junit.runner.RunWith; import org.junit.runners.Suite; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/RestrictedPollTestSuite.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByAdminIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.chorem.pollen.ui.it.AbstractIT; import org.junit.Test; Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/VoterOnlyByNotConnectedIT.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it.restrictedpoll; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ /** * To test on restricted poll. * Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/java/org/chorem/pollen/ui/it/restrictedpoll/java-info.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/0a96604ee43e45e7b9bff495f0d1be7c.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/0a96604ee43e45e7b9bff495f0d1be7c.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/0a96604ee43e45e7b9bff495f0d1be7c.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : everybody restricted poll (by admin)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/0a96604ee43e45e7b9bff495f0d1be7c" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/0a96604ee43e45e7b9bff495f0d1be7c.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/1cfa579292c94bf68eea76da5c7dcc54.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/1cfa579292c94bf68eea76da5c7dcc54.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/1cfa579292c94bf68eea76da5c7dcc54.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : onlyVoter free poll (by admin user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8518ede7bf1247d2ba0dfe222575c5ba" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/231a34e880d4447bbd9247cf6fb08239.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/231a34e880d4447bbd9247cf6fb08239.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/231a34e880d4447bbd9247cf6fb08239.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : everybody free poll (by connected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4cd79d032aa7433d9944ec9376c385c0" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3442086a6b7b4ba48b6431099f61e12a.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3442086a6b7b4ba48b6431099f61e12a.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3442086a6b7b4ba48b6431099f61e12a.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : everybody free poll (by admin user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/3300e59939bd4c9797e360060b8e54be" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3e0c927b3930498195a9da90dd003ff1.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3e0c927b3930498195a9da90dd003ff1.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/3e0c927b3930498195a9da90dd003ff1.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : onlyCreator free poll (by admin user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a04bd349d8964c4fad48ac6ececc60a0" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4bcf02e9758a4e6689f7b9536e8d1414.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4bcf02e9758a4e6689f7b9536e8d1414.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4bcf02e9758a4e6689f7b9536e8d1414.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : anonymous free poll (by connected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/fdd43f4c8d614a9aa48047804583508a" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4ff1aff69b234ed8af88889b2a8334ce.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4ff1aff69b234ed8af88889b2a8334ce.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4ff1aff69b234ed8af88889b2a8334ce.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : creator only restricted poll (by connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/4ff1aff69b234ed8af88889b2a8334ce" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/4ff1aff69b234ed8af88889b2a8334ce.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/5ae795551aa34f1192d761885b9cc7ac.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/5ae795551aa34f1192d761885b9cc7ac.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/5ae795551aa34f1192d761885b9cc7ac.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : creator only restricted poll (by admin)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/5ae795551aa34f1192d761885b9cc7ac" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/5ae795551aa34f1192d761885b9cc7ac.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/63145d6ae2f34f29b18ca4d2ce1eea6f.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/63145d6ae2f34f29b18ca4d2ce1eea6f.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/63145d6ae2f34f29b18ca4d2ce1eea6f.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : anonymous restricted poll (by connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/63145d6ae2f34f29b18ca4d2ce1eea6f" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/63145d6ae2f34f29b18ca4d2ce1eea6f.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/69b8aec17ae5416082666b51debdeb3e.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/69b8aec17ae5416082666b51debdeb3e.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/69b8aec17ae5416082666b51debdeb3e.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : onlyCreator free poll (by not conntected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e61a350a1d714e479aad526ee85b7bc6" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/6ba21b17a8ee4fe3acc2b33d971067fd.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/6ba21b17a8ee4fe3acc2b33d971067fd.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/6ba21b17a8ee4fe3acc2b33d971067fd.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : onlyCreator free poll (by conntected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/075ab18c50c74f83b894c042bba84ff5" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/732d3bd4825b49efae7e4af5de9e1536.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/732d3bd4825b49efae7e4af5de9e1536.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/732d3bd4825b49efae7e4af5de9e1536.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : creator only restricted poll (by not connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/732d3bd4825b49efae7e4af5de9e1536" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/732d3bd4825b49efae7e4af5de9e1536.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7d1d828b24e9450fa346321b32a1d463.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7d1d828b24e9450fa346321b32a1d463.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7d1d828b24e9450fa346321b32a1d463.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : anonymous restricted poll (by admin user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7d1d828b24e9450fa346321b32a1d463" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/7d1d828b24e9450fa346321b32a1d463.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/80f4369d988a40e89b200e22e22e3a52.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/80f4369d988a40e89b200e22e22e3a52.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/80f4369d988a40e89b200e22e22e3a52.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : anonymous restricted poll (by not connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/80f4369d988a40e89b200e22e22e3a52" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/80f4369d988a40e89b200e22e22e3a52.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8b781e56d4d545db82b2dc301a32a7de.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8b781e56d4d545db82b2dc301a32a7de.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8b781e56d4d545db82b2dc301a32a7de.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : anonymous free poll (by admin user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/87cb5b1529374ac0b8c6b7f0b98e169c" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8d904a3490e94ef2a4368b62afc83402.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8d904a3490e94ef2a4368b62afc83402.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8d904a3490e94ef2a4368b62afc83402.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : voter only restricted poll (by connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/8d904a3490e94ef2a4368b62afc83402" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/8d904a3490e94ef2a4368b62afc83402.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a13d4759209a4b919c4a63ee2a0003dc.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a13d4759209a4b919c4a63ee2a0003dc.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a13d4759209a4b919c4a63ee2a0003dc.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : voter only restricted poll (by notconnected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/a13d4759209a4b919c4a63ee2a0003dc" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/a13d4759209a4b919c4a63ee2a0003dc.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/ac92041cf86f4bf9b3b5accfdd63330b.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/ac92041cf86f4bf9b3b5accfdd63330b.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/ac92041cf86f4bf9b3b5accfdd63330b.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : onlyVoter free poll (by connected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/b321ddccf7d743bf9c67b2664231d14f" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/aeff6e804f244b1c8e78fec93262c50f.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/aeff6e804f244b1c8e78fec93262c50f.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/aeff6e804f244b1c8e78fec93262c50f.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : voter only restricted poll (by admin)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/aeff6e804f244b1c8e78fec93262c50f" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/aeff6e804f244b1c8e78fec93262c50f.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b38d0d680fb84ea891c2dd0bf4698a1f.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b38d0d680fb84ea891c2dd0bf4698a1f.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/b38d0d680fb84ea891c2dd0bf4698a1f.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : everybody free poll (by not connected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/2262a31f374e4969bb3593e762c0cae6" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c19ba513378b4c63873f6948bbf3dc72.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c19ba513378b4c63873f6948bbf3dc72.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c19ba513378b4c63873f6948bbf3dc72.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : everybody restricted poll (by not connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/c19ba513378b4c63873f6948bbf3dc72" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c19ba513378b4c63873f6948bbf3dc72.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c672a1f964904c769fcb2235de46bafa.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c672a1f964904c769fcb2235de46bafa.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c672a1f964904c769fcb2235de46bafa.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : onlyVoter free poll (by admin user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/7103c6d4a79246699425e99e1f344b98" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c881d4c8f8a74a2198d292d05489097a.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c881d4c8f8a74a2198d292d05489097a.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/c881d4c8f8a74a2198d292d05489097a.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : anonymous free poll (by not connected user)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/cacb52f4d49047b7a7aa24ec528fcc87" /> Modified: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e4fccb937a0b4bf1a008d17c1234ce45.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e4fccb937a0b4bf1a008d17c1234ce45.xml 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e4fccb937a0b4bf1a008d17c1234ce45.xml 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> + + <feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> <title>Pollen : everybody restricted poll (by connected)</title> <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/e4fccb937a0b4bf1a008d17c1234ce45" /> Property changes on: trunk/pollen-ui-struts2/src/it/pollVoteVisibility/src/test/resources/data/feeds/e4fccb937a0b4bf1a008d17c1234ce45.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/it/pollen-ui-it/src/test/resources/emptydbWithUsers.h2.db ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java =================================================================== --- trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.junit.runner.RunWith; import org.junit.runners.Suite; Property changes on: trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/PollenTestSuite.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/it/security/src/test/java/org/chorem/pollen/ui/it/SecurityAccessSIT.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -58,8 +58,7 @@ public SecurityAccessSIT(Class<? extends WebDriver> driverType) { super(driverType, - "c7082f9752844b83a1859abcae3b681c", - "b9b434acd58d42fca083d473ee021fce"); + "c7082f9752844b83a1859abcae3b681c:b9b434acd58d42fca083d473ee021fce"); } /** Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java 2012-08-28 19:42:01 UTC (rev 3661) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java 2012-08-28 20:00:51 UTC (rev 3662) @@ -1,4 +1,26 @@ package org.chorem.pollen.ui.it; +/* + * #%L + * Pollen :: UI (struts2) + * $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% + */ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/CleanDrivers.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r3661 - in trunk/pollen-ui-struts2/src: it/pollen-ui-it test/java/org/chorem/pollen/ui/it
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 21:42:01 +0200 (Tue, 28 Aug 2012) New Revision: 3661 Url: http://chorem.org/repositories/revision/pollen/3661 Log: refs #606: Add some ITs to prevent regression (can add at build time new selenium driver to use with extraDrivers jvm parameter) Modified: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java Modified: trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2012-08-28 18:46:32 UTC (rev 3660) +++ trunk/pollen-ui-struts2/src/it/pollen-ui-it/pom.xml 2012-08-28 19:42:01 UTC (rev 3661) @@ -47,7 +47,8 @@ <explodedWarPath>../pollen-ui-it/target/war</explodedWarPath> <pollenConfigurationFile>pollen-it.properties</pollenConfigurationFile> - <pollenDataDirectory>${project.build.testOutputDirectory}/data + <pollenDataDirectory> + ${project.build.testOutputDirectory}/data </pollenDataDirectory> </properties> @@ -386,6 +387,7 @@ <pollenDataDirectory> ${pollenDataDirectory} </pollenDataDirectory> + <extraDrivers>${extraDrivers}</extraDrivers> </systemPropertyVariables> </configuration> </execution> Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java 2012-08-28 18:46:32 UTC (rev 3660) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/AbstractPollenIT.java 2012-08-28 19:42:01 UTC (rev 3661) @@ -39,7 +39,6 @@ import org.openqa.selenium.WebElement; import java.util.Calendar; -import java.util.Collection; import java.util.Date; import java.util.List; @@ -56,7 +55,7 @@ protected Log log = LogFactory.getLog(getClass()); @Parameterized.Parameters - public static Collection<Object[]> driverTypes() { + public static Iterable<Object[]> driverTypes() { return WebDriverResources.driverTypes(); } Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java 2012-08-28 18:46:32 UTC (rev 3660) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/it/WebDriverResources.java 2012-08-28 19:42:01 UTC (rev 3661) @@ -25,6 +25,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.rules.TestWatcher; @@ -33,7 +34,6 @@ import org.openqa.selenium.htmlunit.HtmlUnitDriver; import java.util.Arrays; -import java.util.Collection; import java.util.List; import java.util.Map; @@ -48,14 +48,60 @@ /** Logger. */ private static final Log log = LogFactory.getLog(WebDriverResources.class); - protected static Collection<Object[]> driverTypes; + protected static Iterable<Object[]> driverTypes; protected static Map<Class<? extends WebDriver>, WebDriver> drivers = Maps.newHashMap(); - public static Collection<Object[]> driverTypes() { + public static Iterable<Object[]> driverTypes() { if (driverTypes == null) { - driverTypes = prepareDrivers(); + List<Class<? extends WebDriver>> allDrivers = Lists.newArrayList(); +// allDrivers.add(HtmlUnitDriver.class); + allDrivers.add(FirefoxDriver.class); +// allDrivers.add(ChromeDriver.class); +// allDrivers.add(InternetExplorerDriver.class); +// allDrivers.add(SafariDriver.class); + + String extraDriverProperty = System.getProperty("extraDrivers"); + if (StringUtils.isNotBlank(extraDriverProperty)) { + String[] extraDrivers = extraDriverProperty.split("\\s*,\\s*"); + for (String extraDriverFqn : extraDrivers) { + if (log.isInfoEnabled()) { + log.info("Try to add extra driver " + extraDriverFqn); + } + + try { + Class<?> newDriver = Class.forName(extraDriverFqn); + allDrivers.add((Class<? extends WebDriver>) newDriver); + } catch (ClassNotFoundException e) { + if (log.isErrorEnabled()) { + log.error("Could not load class " + extraDriverFqn, e); + } + } + } + } + + List<Class<?>> checkedDrivers = Lists.newArrayList(); + for (Class<? extends WebDriver> driverType : allDrivers) { + + try { + WebDriver driver = createDriver(driverType); + checkedDrivers.add(driverType); + drivers.put(driverType, driver); + } catch (Exception e) { + + // can not use this driver + if (log.isInfoEnabled()) { + log.info("Can not use driver " + driverType.getName(), e); + } + } + } + Object[][] data = new Object[checkedDrivers.size()][1]; + int i = 0; + for (Class<?> checkedDriver : checkedDrivers) { + data[i++][0] = checkedDriver; + } + driverTypes = Arrays.asList(data); } Preconditions.checkNotNull(driverTypes); return driverTypes; @@ -87,38 +133,6 @@ } } - public static List<Object[]> prepareDrivers() { - - List<Class<? extends WebDriver>> allDrivers = Lists.newArrayList(); -// allDrivers.add(HtmlUnitDriver.class); - allDrivers.add(FirefoxDriver.class); -// allDrivers.add(ChromeDriver.class); -// allDrivers.add(InternetExplorerDriver.class); -// allDrivers.add(SafariDriver.class); - - List<Class<?>> checkedDrivers = Lists.newArrayList(); - for (Class<? extends WebDriver> driverType : allDrivers) { - - try { - WebDriver driver = createDriver(driverType); - checkedDrivers.add(driverType); - drivers.put(driverType, driver); - } catch (Exception e) { - - // can not use this driver - if (log.isInfoEnabled()) { - log.info("Can not use driver " + driverType.getName(), e); - } - } - } - Object[][] data = new Object[checkedDrivers.size()][1]; - int i = 0; - for (Class<?> checkedDriver : checkedDrivers) { - data[i++][0] = checkedDriver; - } - return Arrays.asList(data); - } - private static <W extends WebDriver> W createDriver(Class<W> driverType) throws Exception { W result = driverType.getConstructor().newInstance();

1 0

r3660 - in trunk/pollen-ui-struts2/src: it/pollCommentVisibility it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it it/pollCommentVisibility/src/test/resources/data/db it/pollCommentVisibility/src/test/resources/data/feeds main/java/org/chorem/pollen/ui/actions/poll/vote
by tchemit＠users.chorem.org 28 Aug '12

28 Aug '12

Author: tchemit Date: 2012-08-28 20:46:32 +0200 (Tue, 28 Aug 2012) New Revision: 3660 Url: http://chorem.org/repositories/revision/pollen/3660 Log: fixes #743: Add option to allow or not comment in poll (add tests) Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt 2012-08-28 16:58:57 UTC (rev 3659) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/README.txt 2012-08-28 18:46:32 UTC (rev 3660) @@ -2,149 +2,4 @@ PollVoteVisibility ================== -Pour tester la portée des commentaires (http://chorem.org/issues/743) - -anonymous free poll -------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/cacb52f4d49047b7a7aa24ec528fcc87:e814ba6e25174d5983ad796c400520f5 (peut voter) -vote anonyme cacb52f4d49047b7a7aa24ec528fcc87:56acbf87f3c049c2adc757ef1da88ee1 (a,b) (votes non visibles) -vote creator (interdit, votes non visibles) -vote moderate (votes non visibles) -vote user cacb52f4d49047b7a7aa24ec528fcc87:c54a12ffde5d44a4ad9e609aa644fc80 (a) (votes non visibles) (sondage non present dans sondages participes) -vote admin cacb52f4d49047b7a7aa24ec528fcc87:15500943e49842c88d6ceeefaa62e2ed (b) (votes non visibles) (sondage non present dans sondages participes) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/fdd43f4c8d614a9aa48047804583508a:9a8e8523f1ba404f8fde45d1844c59ac (peut voter) -vote anonyme fdd43f4c8d614a9aa48047804583508a:07dc154dce514d368441eaa9f27d21e0 (a,b) (votes non visibles) -vote creator (interdit connecté ou pas, votes non visibles) -vote moderate (votes non visibles) -vote user fdd43f4c8d614a9aa48047804583508a:e67a14d729c7440ebe4a55d589cba515 (a) (votes non visibles) (sondage non present dans sondages participes) -vote admin fdd43f4c8d614a9aa48047804583508a:29993520034a41168def96f908d2696b (b) (votes non visibles) (sondage non present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/87cb5b1529374ac0b8c6b7f0b98e169c:65a3caf0bf204226bfcd259c69e56ca8 (peut voter) -vote anonyme 87cb5b1529374ac0b8c6b7f0b98e169c:a0ff6892a28b4a65809b16cd8903245e (a,b) -vote creator (interdit connecté ou pas, votes non visibles) -vote moderate (votes non visibles) -vote user 87cb5b1529374ac0b8c6b7f0b98e169c:fd47e01378354fcaa220a4ffd0974417 (a) (votes non visibles) (sondage non present dans sondages participes) -vote admin 87cb5b1529374ac0b8c6b7f0b98e169c:010f05042ff3485c834d1ecdc4d17f1e (b) (votes non visibles) (sondage non present dans sondages participes) -sondage crées (sondage present, peut voter) - -onlyCreator free poll ---------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/e61a350a1d714e479aad526ee85b7bc6:8517bd2f6b414072b3d9d6c4cb7e5fd0 (peut voter) -vote anonyme e61a350a1d714e479aad526ee85b7bc6:e8fd28021faa434aa466c5f6bdbc6e94 (a,b) (votes non visibles) -vote creator (vote interdit, votes visibles) -vote moderate (vote interdit, votes visibles) -vote user e61a350a1d714e479aad526ee85b7bc6:52ef06ee93dd4095ae7498edb9e1c28e (a) (votes visibles) (sondage present dans sondages participes) -vote admin e61a350a1d714e479aad526ee85b7bc6:c86b0b775e154fdeaf51ae1e5ef4074d (b) (votes visibles) (sondage present dans sondages participes) - en connecté peut admin les votes, mais pas en deconnecté -sondage crées (sondage present, peut voter) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/075ab18c50c74f83b894c042bba84ff5:0f51b7c953f6427f9c85807fa838d44f (peut voter) -vote anonyme 075ab18c50c74f83b894c042bba84ff5:4937a887797a4ab5ac618152383512ae (a,b) (votes non visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 075ab18c50c74f83b894c042bba84ff5:f162acd5dd8a4242a6f38b098ecec3c3 (a) (votes visibles si connecté) (sondage present dans sondages participes) -vote user2 075ab18c50c74f83b894c042bba84ff5:320e5771bede4c64888a7254fc84a56c () (votes non visibles) (sondage present dans sondages participes) -vote admin 075ab18c50c74f83b894c042bba84ff5:02dbe56ac36d458d95f1fe07ba783f61 (b) (votes visibles si connecté) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/a04bd349d8964c4fad48ac6ececc60a0:a1346bb80bb84913983e91673c76e80c (peut voter) -vote anonyme a04bd349d8964c4fad48ac6ececc60a0:e6fa20f2afb24bdebfdc579c2574a3ab (a,b) (votes non visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user a04bd349d8964c4fad48ac6ececc60a0:01b2b146c6874593b678261f42014935 (a) (votes non visibles) (sondage present dans sondages participes) -vote admin a04bd349d8964c4fad48ac6ececc60a0:cf4f77e74b2f40428595452ce2ee6fbf (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -onlyVoter free poll --------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/8518ede7bf1247d2ba0dfe222575c5ba:ea5c96d4d44547f9b0717f30bfa6dd03 (peut voter) -vote anonyme 8518ede7bf1247d2ba0dfe222575c5ba:fa914a31f6c94cfa8561f48e3c45d6cf (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 8518ede7bf1247d2ba0dfe222575c5ba:5c67d277460b4b4eb1fb59a26bf4a622 (a) (votes visibles connecté ou non) (sondage present dans sondages participes) -vote admin 8518ede7bf1247d2ba0dfe222575c5ba:28d450be407e4eabbb787739ec27ae52 (b) (votes visibles connecté ou non) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/b321ddccf7d743bf9c67b2664231d14f:a48f1b97a3f84443845009c074298bce (peut voter) -vote anonyme b321ddccf7d743bf9c67b2664231d14f:938e4831d7d547a59fd6d76c3bdfe6b5 (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user b321ddccf7d743bf9c67b2664231d14f:b3e407acc97b4911b0de470b1d45a68f (a) (votes visibles connecté ou non) (sondage present dans sondages participes) -vote admin b321ddccf7d743bf9c67b2664231d14f:6f980a4541e04edd9dec95d3dbde0830 (b) (votes visibles connecté ou non) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/7103c6d4a79246699425e99e1f344b98:717ebe61a3b64fcea453c9cba5953149 (peut voter) -vote anonyme 7103c6d4a79246699425e99e1f344b98:ad50a5d406d84aa09e3a02dd9ad0116c (a,b) (vote visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 7103c6d4a79246699425e99e1f344b98:24abe4ba077341b489af505531ac93de (a) (sondage present dans sondages participes) -vote admin 7103c6d4a79246699425e99e1f344b98:2237dbc51f7c4268a8a7e10f6146ae87 (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -everybody free poll -------------------- - -by not connected user -~~~~~~~~~~~~~~~~~~~~~ - -admin poll/summrary/2262a31f374e4969bb3593e762c0cae6:659bb046fc06493f9909ca9f34ca6261 (peut voter) -vote anonyme 2262a31f374e4969bb3593e762c0cae6:6909131490ab4a1abae0daaf15129cdb (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 2262a31f374e4969bb3593e762c0cae6:f058910736af48e9905f83f3f5de5b8d (a) (sondage present dans sondages participes) -vote admin 2262a31f374e4969bb3593e762c0cae6:2d97c079df054a7c9fc321b2df3488f3 (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by connected user -~~~~~~~~~~~~~~~~~ - -admin poll/summrary/4cd79d032aa7433d9944ec9376c385c0:f26e253004d14547b465b5a414b65a7f (peut voter) -vote anonyme 4cd79d032aa7433d9944ec9376c385c0:307222b5e17442758bd23fc9d8a19f5e (a,b) (votes visibles) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 4cd79d032aa7433d9944ec9376c385c0:8a10f049538142669ca84bb034f7a886 (a) (sondage present dans sondages participes) -vote admin 4cd79d032aa7433d9944ec9376c385c0:6e92bf48f672429ea265a2647bef415d (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) - -by admin user -~~~~~~~~~~~~~ - -admin poll/summrary/3300e59939bd4c9797e360060b8e54be:c370172faf7a4108be0d76630af34c4b (peut voter) -vote anonyme 3300e59939bd4c9797e360060b8e54be:4399e0ff6dbe4544b64861d1e234ee1a (a,b) (sondage present dans sondages participes) -vote creator (vote interdit mais peut admin les votes) -vote moderate (vote interdit mais peut admin les votes) -vote user 3300e59939bd4c9797e360060b8e54be:5af1c33357084f89a56d1cde89584cb7 (a) (sondage present dans sondages participes) -vote admin 3300e59939bd4c9797e360060b8e54be:335e6a3921fb4dd5b6220c55311b7931 (b) (sondage present dans sondages participes) -sondage crées (sondage present, peut voter) \ No newline at end of file +Pour tester la portée des commentaires (http://chorem.org/issues/743) \ No newline at end of file Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 16:58:57 UTC (rev 3659) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithCommentIT.java 2012-08-28 18:46:32 UTC (rev 3660) @@ -1,6 +1,11 @@ package org.chorem.pollen.ui.it; +import org.apache.commons.lang.StringUtils; +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; /** * Poll with comment possible. @@ -9,7 +14,41 @@ * @since 1.4.5 */ public class PollWithCommentIT extends AbstractPollIT { - protected PollWithCommentIT(Class<? extends WebDriver> driverType) { - super(driverType, ""); + + public PollWithCommentIT(Class<? extends WebDriver> driverType) { + super(driverType, "6de9197bda3b4f908cf047a48ea50395:70505c6db78c4fcd8218a9fa6a543853"); } + + @Test + public void checkEditPage() { + + // access to edit page + gotoUrl(urlFixtures.editPoll(creatorUri), true); + + // Go to option panel : click on it + WebElement optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + // get pollCommentVisibility checkbox + + WebElement checkBox = findElement(By.name("pollCommentVisible")); + Assert.assertEquals("input", checkBox.getTagName()); + + // check checked attribute exists and is not blank + Assert.assertTrue(StringUtils.isNotBlank(checkBox.getAttribute("checked"))); + } + + @Test + public void checkVotePage() { + + // access to votefor page with no accountId + gotoUrl(urlFixtures.voteforPoll(pollUri), true); + + // comment zone found + findElement(By.id("commentZone")); + + // comment button found + findElement(By.id("addCommentForm_pollen_action_addComment")); + + } } Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java 2012-08-28 16:58:57 UTC (rev 3659) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/java/org/chorem/pollen/ui/it/PollWithoutCommentIT.java 2012-08-28 18:46:32 UTC (rev 3660) @@ -1,6 +1,10 @@ package org.chorem.pollen.ui.it; +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; /** * Poll with no comment possible. @@ -9,7 +13,36 @@ * @since 1.4.5 */ public class PollWithoutCommentIT extends AbstractPollIT { - protected PollWithoutCommentIT(Class<? extends WebDriver> driverType) { - super(driverType, ""); + + public PollWithoutCommentIT(Class<? extends WebDriver> driverType) { + super(driverType, "5b7d6a90540f4173bfb8d60778ef6dd9:b4b3fa093b68418eaff755e8f9dac97d"); } + + @Test + public void checkEditPage() { + + // access to edit page + gotoUrl(urlFixtures.editPoll(creatorUri), true); + + // Go to option panel : click on it + WebElement optionsClick = findElement(By.xpath("//a[@href=\"#toptions\"]")); + optionsClick.click(); + + // get pollCommentVisible checkbox + WebElement checkBox = findElement(By.name("pollCommentVisible")); + Assert.assertEquals("input", checkBox.getTagName()); + + // check no checked attribute + Assert.assertNull(checkBox.getAttribute("checked")); + } + + @Test + public void checkVotePage() { + + // access to votefor page with no accountId + gotoUrl(urlFixtures.voteforPoll(pollUri), true); + + // no comment zone + checkNoElement(By.id("commentZone")); + } } Modified: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/db/pollendb.h2.db =================================================================== (Binary files differ) Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml 2012-08-28 18:46:32 UTC (rev 3660) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : poll with no comment</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/5b7d6a90540f4173bfb8d60778ef6dd9" /> + <subtitle /> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/5b7d6a90540f4173bfb8d60778ef6dd9" /> + <author> + <name /> + </author> + <updated>2012-08-28T18:28:46Z</updated> + <published>2012-08-28T18:28:46Z</published> + <summary type="text" /> + <dc:date>2012-08-28T18:28:46Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/5b7d6a90540f4173bfb8d60778ef6dd9.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml =================================================================== --- trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml (rev 0) +++ trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml 2012-08-28 18:46:32 UTC (rev 3660) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feed xmlns="http://www.w3.org/2005/Atom" xmlns:dc="http://purl.org/dc/elements/1.1/"> + <title>Pollen : pollWithComments</title> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/6de9197bda3b4f908cf047a48ea50395" /> + <subtitle /> + <entry> + <title /> + <link rel="alternate" href="http://localhost:8080/pollen/poll/votefor/6de9197bda3b4f908cf047a48ea50395" /> + <author> + <name /> + </author> + <updated>2012-08-28T18:26:50Z</updated> + <published>2012-08-28T18:26:50Z</published> + <summary type="text" /> + <dc:date>2012-08-28T18:26:50Z</dc:date> + </entry> +</feed> + Property changes on: trunk/pollen-ui-struts2/src/it/pollCommentVisibility/src/test/resources/data/feeds/6de9197bda3b4f908cf047a48ea50395.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-28 16:58:57 UTC (rev 3659) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/vote/VoteForPoll.java 2012-08-28 18:46:32 UTC (rev 3660) @@ -71,15 +71,12 @@ addFlashWarning(_("pollen.information.pollFinished")); } else if (!isVoteAllowed()) { - addFlashWarning(_("pollen.information.pollCanNotVote")); + addFlashWarning(_("pollen.information.pollCanNotVote")); } if (isPollChoiceRunning()) { addFlashMessage(_("pollen.information.pollChoiceRunning")); } - if (!isCommentAllowed()) { - addFlashMessage(_("pollen.information.pollCommentNotAuthorized")); - } } @Override

1 0