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>commons-logging</groupId> <artifactId>commons-logging</artifactId> - </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