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

r3406 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 18:53:09 +0200 (Mon, 28 May 2012) New Revision: 3406 Url: http://chorem.org/repositories/revision/pollen/3406 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 16:53:07 UTC (rev 3405) +++ trunk/pollen-persistence/pom.xml 2012-05-28 16:53:09 UTC (rev 3406) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 16:53:07 UTC (rev 3405) +++ trunk/pollen-services/pom.xml 2012-05-28 16:53:09 UTC (rev 3406) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:53:07 UTC (rev 3405) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:53:09 UTC (rev 3406) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 16:53:07 UTC (rev 3405) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 16:53:09 UTC (rev 3406) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 16:53:07 UTC (rev 3405) +++ trunk/pom.xml 2012-05-28 16:53:09 UTC (rev 3406) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.4-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -473,11 +473,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1.1</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1.1 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3.1.1</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3405 - in tags: . pollen-1.3.1.1
by maven-release＠users.chorem.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 18:53:07 +0200 (Mon, 28 May 2012) New Revision: 3405 Url: http://chorem.org/repositories/revision/pollen/3405 Log: [maven-release-plugin] copy for tag pollen-1.3.1.1 Added: tags/pollen-1.3.1.1/ Property changes on: tags/pollen-1.3.1.1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3404 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 18:53:05 +0200 (Mon, 28 May 2012) New Revision: 3404 Url: http://chorem.org/repositories/revision/pollen/3404 Log: [maven-release-plugin] prepare release pollen-1.3.1.1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) +++ trunk/pollen-persistence/pom.xml 2012-05-28 16:53:05 UTC (rev 3404) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) +++ trunk/pollen-services/pom.xml 2012-05-28 16:53:05 UTC (rev 3404) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:53:05 UTC (rev 3404) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 16:53:05 UTC (rev 3404) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) +++ trunk/pom.xml 2012-05-28 16:53:05 UTC (rev 3404) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1-SNAPSHOT</version> + <version>1.3.1.1</version> <modules> <module>pollen-votecounting</module> @@ -473,11 +473,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1.1</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3.1.1</url> </scm> <distributionManagement>

1 0

r3403 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by tchemit＠users.chorem.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 18:51:23 +0200 (Mon, 28 May 2012) New Revision: 3403 Url: http://chorem.org/repositories/revision/pollen/3403 Log: prepare version 1.3.1.1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 16:50:10 UTC (rev 3402) +++ trunk/pollen-persistence/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.3.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 16:50:10 UTC (rev 3402) +++ trunk/pollen-services/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.3.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:50:10 UTC (rev 3402) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.3.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 16:50:10 UTC (rev 3402) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.3.1.1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 16:50:10 UTC (rev 3402) +++ trunk/pom.xml 2012-05-28 16:51:23 UTC (rev 3403) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1.1</version> + <version>1.3.1.1-SNAPSHOT</version> <modules> <module>pollen-votecounting</module>

1 0

r3402 - trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration
by tchemit＠users.chorem.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 18:50:10 +0200 (Mon, 28 May 2012) New Revision: 3402 Url: http://chorem.org/repositories/revision/pollen/3402 Log: fixes #572: Fix migration from 1.3 to 1.3.1 Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java Removed: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-05-28 16:49:40 UTC (rev 3401) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-05-28 16:50:10 UTC (rev 3402) @@ -44,11 +44,11 @@ public static final Version V_1_3 = VersionUtil.valueOf("1.3"); - public static final Version V_1_4 = VersionUtil.valueOf("1.4"); + public static final Version V_1_3_1 = VersionUtil.valueOf("1.3.1"); /** Les versions de mise à jour disponibles. */ public static final Version[] AVAILABLE_VERSIONS = new Version[]{ - V_1_1, V_1_2, V_1_3, V_1_4 + V_1_1, V_1_2, V_1_3, V_1_3_1 }; public PollenMigrationCallback() { Copied: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java (from rev 3395, trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java) =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java (rev 0) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java 2012-05-28 16:50:10 UTC (rev 3402) @@ -0,0 +1,124 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.entities.migration; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaSQLQuery; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.List; + +/** + * Migration for version {@code 1.4}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class PollenMigrationCallbackV1_3_1 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { + + public PollenMigrationCallbackV1_3_1(TopiaMigrationCallbackByClass callBack) { + super(PollenMigrationCallback.V_1_3_1, callBack); + } + + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, + boolean showSql, + boolean showProgression) throws TopiaException { + + // add indexed choices (says there is an order kept in db) : http://chorem.org/issues/154 + addIndexedChoices(tx, queries); + + } + + private void addIndexedChoices(TopiaContextImplementor tx, + List<String> queries) throws TopiaException { + + queries.add("ALTER TABLE choice ADD COLUMN poll_idx INTEGER;"); + + // get all polls + + + TopiaSQLQuery<String> getAllPollsQuery = new TopiaSQLQuery<String>() { + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement ps = connection.prepareStatement("select distinct(poll) from choice;"); + return ps; + } + + @Override + protected String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }; + List<String> pollIds = getAllPollsQuery.findMultipleResult(tx); + + String choiceUpdate = "UPDATE choice SET poll_idx = %s WHERE topiaid = '%s';"; + + for (final String pollId : pollIds) { + + // get all choice ids for this poll + List<String> choiceIds = + new GetChoiceIdsSQLQuery(pollId).findMultipleResult(tx); + + int index = 0; + for (String choiceId : choiceIds) { + queries.add(String.format(choiceUpdate, index++, choiceId)); + } + + } + + // now can add not null constraints + // can not use this strong not null constraint, hibernate will at create time let a null value here :( +// queries.add("ALTER TABLE choice ALTER COLUMN poll_idx SET NOT NULL;"); + } + + private static class GetChoiceIdsSQLQuery extends TopiaSQLQuery<String> { + + private final String pollId; + + public GetChoiceIdsSQLQuery(String pollId) { + this.pollId = pollId; + } + + @Override + protected PreparedStatement prepareQuery(Connection connection) throws SQLException { + PreparedStatement ps = connection.prepareStatement( + "SELECT topiaid FROM choice WHERE poll = ? ORDER BY topiacreatedate;"); + ps.setString(1, pollId); + return ps; + } + + @Override + protected String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + } +} Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3_1.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-05-28 16:49:40 UTC (rev 3401) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-05-28 16:50:10 UTC (rev 3402) @@ -1,124 +0,0 @@ -/* - * #%L - * Pollen :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.entities.migration; - -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; - -/** - * Migration for version {@code 1.4}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -public class PollenMigrationCallbackV1_4 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { - - public PollenMigrationCallbackV1_4(TopiaMigrationCallbackByClass callBack) { - super(PollenMigrationCallback.V_1_4, callBack); - } - - @Override - protected void prepareMigrationScript(TopiaContextImplementor tx, - List<String> queries, - boolean showSql, - boolean showProgression) throws TopiaException { - - // add indexed choices (says there is an order kept in db) : http://chorem.org/issues/154 - addIndexedChoices(tx, queries); - - } - - private void addIndexedChoices(TopiaContextImplementor tx, - List<String> queries) throws TopiaException { - - queries.add("ALTER TABLE choice ADD COLUMN poll_idx INTEGER;"); - - // get all polls - - - TopiaSQLQuery<String> getAllPollsQuery = new TopiaSQLQuery<String>() { - - @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement ps = connection.prepareStatement("select distinct(poll) from choice;"); - return ps; - } - - @Override - protected String prepareResult(ResultSet set) throws SQLException { - return set.getString(1); - } - }; - List<String> pollIds = getAllPollsQuery.findMultipleResult(tx); - - String choiceUpdate = "UPDATE choice SET poll_idx = %s WHERE topiaid = '%s';"; - - for (final String pollId : pollIds) { - - // get all choice ids for this poll - List<String> choiceIds = - new GetChoiceIdsSQLQuery(pollId).findMultipleResult(tx); - - int index = 0; - for (String choiceId : choiceIds) { - queries.add(String.format(choiceUpdate, index++, choiceId)); - } - - } - - // now can add not null constraints - // can not use this strong not null constraint, hibernate will at create time let a null value here :( -// queries.add("ALTER TABLE choice ALTER COLUMN poll_idx SET NOT NULL;"); - } - - private static class GetChoiceIdsSQLQuery extends TopiaSQLQuery<String> { - - private final String pollId; - - public GetChoiceIdsSQLQuery(String pollId) { - this.pollId = pollId; - } - - @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement ps = connection.prepareStatement( - "SELECT topiaid FROM choice WHERE poll = ? ORDER BY topiacreatedate;"); - ps.setString(1, pollId); - return ps; - } - - @Override - protected String prepareResult(ResultSet set) throws SQLException { - return set.getString(1); - } - } -}

1 0

r3401 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by tchemit＠users.chorem.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 18:49:40 +0200 (Mon, 28 May 2012) New Revision: 3401 Url: http://chorem.org/repositories/revision/pollen/3401 Log: prepare version 1.3.1.1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) +++ trunk/pollen-persistence/pom.xml 2012-05-28 16:49:40 UTC (rev 3401) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) +++ trunk/pollen-services/pom.xml 2012-05-28 16:49:40 UTC (rev 3401) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:49:40 UTC (rev 3401) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 16:49:40 UTC (rev 3401) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) +++ trunk/pom.xml 2012-05-28 16:49:40 UTC (rev 3401) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.3.1.1</version> <modules> <module>pollen-votecounting</module>

1 0

r3400 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 18:17:36 +0200 (Mon, 28 May 2012) New Revision: 3400 Url: http://chorem.org/repositories/revision/pollen/3400 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 16:17:34 UTC (rev 3399) +++ trunk/pollen-persistence/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 16:17:34 UTC (rev 3399) +++ trunk/pollen-services/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:17:34 UTC (rev 3399) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 16:17:34 UTC (rev 3399) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 16:17:34 UTC (rev 3399) +++ trunk/pom.xml 2012-05-28 16:17:36 UTC (rev 3400) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1</version> + <version>1.4-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -473,11 +473,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3.1</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3399 - in tags: . pollen-1.3.1
by maven-release＠users.chorem.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 18:17:34 +0200 (Mon, 28 May 2012) New Revision: 3399 Url: http://chorem.org/repositories/revision/pollen/3399 Log: [maven-release-plugin] copy for tag pollen-1.3.1 Added: tags/pollen-1.3.1/ Property changes on: tags/pollen-1.3.1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3398 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org May 28, 2012

May 28, 2012

Author: maven-release Date: 2012-05-28 18:17:32 +0200 (Mon, 28 May 2012) New Revision: 3398 Url: http://chorem.org/repositories/revision/pollen/3398 Log: [maven-release-plugin] prepare release pollen-1.3.1 Modified: trunk/pollen-persistence/pom.xml trunk/pollen-services/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-05-28 16:14:38 UTC (rev 3397) +++ trunk/pollen-persistence/pom.xml 2012-05-28 16:17:32 UTC (rev 3398) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-28 16:14:38 UTC (rev 3397) +++ trunk/pollen-services/pom.xml 2012-05-28 16:17:32 UTC (rev 3398) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:14:38 UTC (rev 3397) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-28 16:17:32 UTC (rev 3398) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-28 16:14:38 UTC (rev 3397) +++ trunk/pollen-votecounting/pom.xml 2012-05-28 16:17:32 UTC (rev 3398) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-28 16:14:38 UTC (rev 3397) +++ trunk/pom.xml 2012-05-28 16:17:32 UTC (rev 3398) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> <modules> <module>pollen-votecounting</module> @@ -473,11 +473,11 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3.1 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3.1</url> </scm> <distributionManagement>

1 0

r3397 - trunk/pollen-ui-struts2/src/main/webapp/css
by tchemit＠users.chorem.org May 28, 2012

May 28, 2012

Author: tchemit Date: 2012-05-28 18:14:38 +0200 (Mon, 28 May 2012) New Revision: 3397 Url: http://chorem.org/repositories/revision/pollen/3397 Log: improve varning color (refs #517: Add a WARNING message level) Modified: trunk/pollen-ui-struts2/src/main/webapp/css/common.css Modified: trunk/pollen-ui-struts2/src/main/webapp/css/common.css =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-05-28 16:10:06 UTC (rev 3396) +++ trunk/pollen-ui-struts2/src/main/webapp/css/common.css 2012-05-28 16:14:38 UTC (rev 3397) @@ -151,7 +151,7 @@ } .info_warning { - background: no-repeat scroll 8px 5px #fff71f; + background: no-repeat scroll 8px 5px #ffff8e; border: 2px solid #FFCC00; width: 970px; margin-bottom: 5px; @@ -168,6 +168,7 @@ font-style: italic; padding-left: 25px; color: #e09210; + /*color: #e09210;*/ margin-left:0px; }

1 0