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

r3367 - in trunk/pollen-ui-struts2/src/main/resources: . config
by tchemit＠users.chorem.org May 17, 2012

May 17, 2012

Author: tchemit Date: 2012-05-18 01:29:28 +0200 (Fri, 18 May 2012) New Revision: 3367 Url: http://chorem.org/repositories/revision/pollen/3367 Log: clean strusts mappings Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml trunk/pollen-ui-struts2/src/main/resources/struts.xml Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-05-15 16:03:51 UTC (rev 3366) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-05-17 23:29:28 UTC (rev 3367) @@ -71,9 +71,7 @@  <action name="deleteUser" class="org.chorem.pollen.ui.actions.admin.DeleteUser"> -  <result type="redirect2"/> -  </action> </package> Modified: trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-05-15 16:03:51 UTC (rev 3366) +++ trunk/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-05-17 23:29:28 UTC (rev 3367) @@ -95,9 +95,7 @@ <action name="deleteFavoriteList" class="org.chorem.pollen.ui.actions.user.DeleteFavoriteList"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> -  <result type="redirect2"/> -  </action>  @@ -133,8 +131,6 @@ <action name="deletePollAccount" class="org.chorem.pollen.ui.actions.user.DeletePollAccount"> <interceptor-ref name="pollenParamsPrepareParamsStack"/> -  -  <result type="redirect2"/> </action> Modified: trunk/pollen-ui-struts2/src/main/resources/struts.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-05-15 16:03:51 UTC (rev 3366) +++ trunk/pollen-ui-struts2/src/main/resources/struts.xml 2012-05-17 23:29:28 UTC (rev 3367) @@ -78,31 +78,23 @@ <interceptor-stack name="pollenBasicStack"> <interceptor-ref name="i18n"/> <interceptor-ref name="basicStack"/> - </interceptor-stack>  <interceptor-stack name="pollenParamsPrepareParamsStack"> <interceptor-ref name="i18n"/> -  <interceptor-ref name="exception"/> <interceptor-ref name="alias"/> <interceptor-ref name="i18n"/> <interceptor-ref name="checkbox"/> <interceptor-ref name="multiselect"/> <interceptor-ref name="pollenFileUpload"/> - <interceptor-ref name="servletConfig"/> <interceptor-ref name="staticParams"/> <interceptor-ref name="prepare"/> <interceptor-ref name="chain"/> <interceptor-ref name="modelDriven"/> -  <interceptor-ref name="actionMappingParams"/> <interceptor-ref name="params"> <param name="excludeParams">dojo\..*,^struts\..*</param> @@ -114,9 +106,6 @@ <interceptor-ref name="workflow"> <param name="excludeMethods">input,back,cancel,browse</param> </interceptor-ref> - </interceptor-stack> </interceptors> @@ -144,9 +133,6 @@ <result>/WEB-INF/jsp/home.jsp</result> <interceptor-ref name="i18n"/> <interceptor-ref name="basicStack"/> - </action>  @@ -160,9 +146,6 @@ <interceptor-ref name="paramRemover"> <param name="paramNames">request_locale</param> </interceptor-ref> - </action> </package>

1 0

r3366 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/java/org/chorem/pollen/entities/migration pollen-persistence/src/test/java/org/chorem/pollen/business/persistence pollen-services/src/test/java/org/chorem/pollen/services pollen-ui-struts2/src/main/java/org/chorem/pollen/ui
by bleny＠users.chorem.org May 15, 2012

May 15, 2012

Author: bleny Date: 2012-05-15 18:03:51 +0200 (Tue, 15 May 2012) New Revision: 3366 Url: http://chorem.org/repositories/revision/pollen/3366 Log: code review : misc minor fixes Added: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java Removed: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java Deleted: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java 2012-05-03 14:40:57 UTC (rev 3365) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -1,66 +0,0 @@ -/* - * #%L - * Pollen :: Persistence - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.File; - -/** - * Some utils IO methods. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.3 - */ -public class PolleIOUtil { - - /** Logger. */ - private static final Log log = LogFactory.getLog(PolleIOUtil.class); - - protected PolleIOUtil() { - } - - public static File getTestSpecificDirectory(Class<?> klass, String methodName, long timestamp) { - // Trying to look for the temporary folder to store data for the test - String tempDirPath = System.getProperty("java.io.tmpdir"); - if (tempDirPath == null) { - // can this really occur ? - tempDirPath = ""; - if (log.isWarnEnabled()) { - log.warn("'\"java.io.tmpdir\" not defined"); - } - } - File tempDirFile = new File(tempDirPath); - - // create the directory to store database data - String dataBasePath = klass.getName() - + File.separator // a directory with the test class name - + methodName // a sub-directory with the method name - + '_' - + timestamp; // and a timestamp - File databaseFile = new File(tempDirFile, dataBasePath); - return databaseFile; - } -} Copied: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java (from rev 3365, trunk/pollen-persistence/src/main/java/org/chorem/pollen/PolleIOUtil.java) =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java (rev 0) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -0,0 +1,66 @@ +/* + * #%L + * Pollen :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.File; + +/** + * Some utils IO methods. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class PollenIOUtil { + + /** Logger. */ + private static final Log log = LogFactory.getLog(PollenIOUtil.class); + + protected PollenIOUtil() { + } + + public static File getTestSpecificDirectory(Class<?> klass, String methodName, long timestamp) { + // Trying to look for the temporary folder to store data for the test + String tempDirPath = System.getProperty("java.io.tmpdir"); + if (tempDirPath == null) { + // can this really occur ? + tempDirPath = ""; + if (log.isWarnEnabled()) { + log.warn("'\"java.io.tmpdir\" not defined"); + } + } + File tempDirFile = new File(tempDirPath); + + // create the directory to store database data + String dataBasePath = klass.getName() + + File.separator // a directory with the test class name + + methodName // a sub-directory with the method name + + '_' + + timestamp; // and a timestamp + File databaseFile = new File(tempDirFile, dataBasePath); + return databaseFile; + } +} Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-05-03 14:40:57 UTC (rev 3365) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -42,7 +42,7 @@ public class PollenMigrationCallbackV1_2 extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion { public PollenMigrationCallbackV1_2(TopiaMigrationCallbackByClass callBack) { - super(PollenMigrationCallback.V_1_1, callBack); + super(PollenMigrationCallback.V_1_2, callBack); } @Override Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-05-03 14:40:57 UTC (rev 3365) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/AbstractDAOTest.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PolleIOUtil; +import org.chorem.pollen.PollenIOUtil; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.junit.Rule; @@ -55,9 +55,9 @@ public static final long TIMESTAMP = System.nanoTime(); @Rule - public T3Database db = new T3Database(); + public PollenDatabase db = new PollenDatabase(); - public T3Database getDb() { + public PollenDatabase getDb() { return db; } @@ -73,9 +73,9 @@ * A new database created for each test. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.0 + * @since 1.3 */ - public static class T3Database extends TestWatcher { + public static class PollenDatabase extends TestWatcher { private File testBasedir; @@ -90,7 +90,7 @@ @Override protected void starting(Description description) { - testBasedir = PolleIOUtil.getTestSpecificDirectory( + testBasedir = PollenIOUtil.getTestSpecificDirectory( description.getTestClass(), description.getMethodName(), TIMESTAMP); Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-05-03 14:40:57 UTC (rev 3365) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -26,7 +26,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PolleIOUtil; +import org.chorem.pollen.PollenIOUtil; import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.junit.rules.TestWatcher; @@ -77,7 +77,7 @@ super.starting(description); PollenTopiaRootContextFactory factory = new PollenTopiaRootContextFactory(); - testDir = PolleIOUtil.getTestSpecificDirectory( + testDir = PollenIOUtil.getTestSpecificDirectory( description.getTestClass(), description.getMethodName(), TIMESTAMP); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-05-03 14:40:57 UTC (rev 3365) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -36,7 +36,7 @@ import javax.servlet.ServletRequest; /** - * EchoBase implementation of the {@link TopiaTransactionFilter}. + * Pollen implementation of the {@link TopiaTransactionFilter}. * * @author tchemit <chemit(a)codelutin.com> * @since 1.3 @@ -66,7 +66,7 @@ try { TopiaContext transaction = rootContext.beginTransaction(); if (log.isDebugEnabled()) { - log.debug("Starts a new echo transaction " + transaction); + log.debug("Starts a new transaction " + transaction); } return transaction; } catch (TopiaException eee) { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-05-03 14:40:57 UTC (rev 3365) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-05-15 16:03:51 UTC (rev 3366) @@ -33,7 +33,7 @@ import java.net.URL; /** - * Usefull ui methods. + * Useful ui methods. * * @author tchemit <chemit(a)codelutin.com> * @since 1.3

1 0

r3365 - trunk/pollen-ui-struts2/src/main/resources/i18n
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 16:40:57 +0200 (Thu, 03 May 2012) New Revision: 3365 Url: http://chorem.org/repositories/revision/pollen/3365 Log: i18n Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 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-05-03 14:27:13 UTC (rev 3364) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-03 14:40:57 UTC (rev 3365) @@ -25,6 +25,8 @@ pollen.action.editPollAccount=Edit selected member pollen.action.editUser=Edit selected user pollen.action.editVote=Modifier le vote +pollen.action.importPersonListToExistingVotingList=Add selected voting list +pollen.action.importPersonListToNewVotingList=Create a new group from the selected voting list pollen.action.login=Log me In pollen.action.modify=Modify pollen.action.pollChoiceDelete=Delete this choice @@ -84,12 +86,14 @@ pollen.common.myPolls=My polls pollen.common.name=Name pollen.common.nbAccounts=Number of members +pollen.common.nbVotes=%s votes are recorded pollen.common.newPassword=New password pollen.common.newPassword2=Reenter new passworsd pollen.common.normal=normal pollen.common.or=or pollen.common.password=Password pollen.common.password2=Renter your password +pollen.common.personList=Voting lists pollen.common.personToList=Voter pollen.common.pollCreator=Creator pollen.common.pollOption.anonymous=Anonymous @@ -209,6 +213,9 @@ pollen.information.confirmDeleteChoice=Confirm delete of choice %s pollen.information.confirmDeleteFavoriteList=Confirm delete of favorite list\: pollen.information.confirmDeletePoll=Confirm delete of poll\: +pollen.information.confirmDeletePollAccount=Confirm to delete voting\: +pollen.information.confirmDeletePollChoice=Confir to delete choice %s +pollen.information.confirmDeletePollVote=Confirm delete of vote of %s pollen.information.confirmDeleteUser=Confirm delete of user\: pollen.information.confirmDeleteVote=Confirm delete of vote for %s pollen.information.favoriteList.created=Favorite list %s created. @@ -274,6 +281,7 @@ pollen.title.myAccount=My account pollen.title.pollsCreatedList=Polls created pollen.title.pollsCreatedList.legend=Polls you have proposed +pollen.title.pollsInvitedList=Invited polls pollen.title.pollsInvitedList.legend=Polls for which you are invited to vote pollen.title.pollsList=Polls administration pollen.title.pollsParticipatedList=Polls participated @@ -282,13 +290,5 @@ pollen.title.selectPersonListToAddVotingList=Select a voter list to import in voting list pollen.title.selectPersonListToCreateVotingList=Select a favorite list to import in a new voting list pollen.title.usersList=Users administration +title=Create a poll vote.anonymous=Anonymous vote -pollen.information.confirmDeletePollVote=Confirm delete of vote of %s -pollen.common.personList=Voting lists -pollen.action.importPersonListToExistingVotingList=Add selected voting list -pollen.action.importPersonListToNewVotingList=Create a new group from the selected voting list -pollen.common.nbVotes=%s votes are recorded -pollen.information.confirmDeletePollAccount=Confirm to delete voting\: -pollen.information.confirmDeletePollChoice=Confir to delete choice %s -pollen.title.pollsInvitedList=Invited polls -title=Create a poll

1 0

r3364 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 16:27:13 +0200 (Thu, 03 May 2012) New Revision: 3364 Url: http://chorem.org/repositories/revision/pollen/3364 Log: fixes #547: Can not access Favorit List admin page while in english language Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-05-03 14:21:42 UTC (rev 3363) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-05-03 14:27:13 UTC (rev 3364) @@ -51,7 +51,7 @@ var editImg = '<s:url value='/img/edit.png'/>'; var editTitle = '<s:text name="pollen.action.editFavoriteList"/>'; var deleteImg = '<s:url value='/img/delete.png'/>'; - var csvHelp = '<div><s:text name="pollen.common.favoriteList.csvImport.help"/>' + + var csvHelp = "<div><s:text name='pollen.common.favoriteList.csvImport.help'/>" + "<br/><img src=\"<s:url value="/img/import_csv_help.png"/>\"/></div>" jQuery(document).ready(function () {

1 0

r3363 - in trunk/pollen-ui-struts2/src/main: resources/i18n webapp/WEB-INF/jsp/user
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 16:21:42 +0200 (Thu, 03 May 2012) New Revision: 3363 Url: http://chorem.org/repositories/revision/pollen/3363 Log: refs #546: Fix missing translations for english. Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-03 14:20:47 UTC (rev 3362) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-05-03 14:21:42 UTC (rev 3363) @@ -209,7 +209,7 @@ pollen.information.confirmDeleteChoice=Confirm delete of choice %s pollen.information.confirmDeleteFavoriteList=Confirm delete of favorite list\: pollen.information.confirmDeletePoll=Confirm delete of poll\: -pollen.information.confirmDeleteUser=Confirm delete of user %s +pollen.information.confirmDeleteUser=Confirm delete of user\: pollen.information.confirmDeleteVote=Confirm delete of vote for %s pollen.information.favoriteList.created=Favorite list %s created. pollen.information.favoriteList.deleted=Favorite list %s deleted. @@ -283,3 +283,12 @@ pollen.title.selectPersonListToCreateVotingList=Select a favorite list to import in a new voting list pollen.title.usersList=Users administration vote.anonymous=Anonymous vote +pollen.information.confirmDeletePollVote=Confirm delete of vote of %s +pollen.common.personList=Voting lists +pollen.action.importPersonListToExistingVotingList=Add selected voting list +pollen.action.importPersonListToNewVotingList=Create a new group from the selected voting list +pollen.common.nbVotes=%s votes are recorded +pollen.information.confirmDeletePollAccount=Confirm to delete voting\: +pollen.information.confirmDeletePollChoice=Confir to delete choice %s +pollen.title.pollsInvitedList=Invited polls +title=Create a poll Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-05-03 14:20:47 UTC (rev 3362) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-05-03 14:21:42 UTC (rev 3363) @@ -52,7 +52,7 @@ var editTitle = '<s:text name="pollen.action.editFavoriteList"/>'; var deleteImg = '<s:url value='/img/delete.png'/>'; var csvHelp = '<div><s:text name="pollen.common.favoriteList.csvImport.help"/>' + - '<br/><img src="<s:url value="/img/import_csv_help.png"/>"/></div>' + "<br/><img src=\"<s:url value="/img/import_csv_help.png"/>\"/></div>" jQuery(document).ready(function () {

1 0

r3362 - trunk/pollen-ui-struts2/src/main/webapp/img
by fdesbois＠users.chorem.org May 3, 2012

May 3, 2012

Author: fdesbois Date: 2012-05-03 16:20:47 +0200 (Thu, 03 May 2012) New Revision: 3362 Url: http://chorem.org/repositories/revision/pollen/3362 Log: add missing image file Added: trunk/pollen-ui-struts2/src/main/webapp/img/import_csv_help.png Added: trunk/pollen-ui-struts2/src/main/webapp/img/import_csv_help.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2/src/main/webapp/img/import_csv_help.png ___________________________________________________________________ Added: svn:mime-type + image/png Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r3361 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org May 3, 2012

May 3, 2012

Author: tchemit Date: 2012-05-03 16:04:07 +0200 (Thu, 03 May 2012) New Revision: 3361 Url: http://chorem.org/repositories/revision/pollen/3361 Log: do not deploy embedded war Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-03 13:14:18 UTC (rev 3360) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-03 14:04:07 UTC (rev 3361) @@ -373,6 +373,7 @@ <goal>war</goal> </goals> <configuration> + <primaryArtifact>false</primaryArtifact> <webappDirectory> target/pollen-embedded-${project.version} </webappDirectory>

1 0

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

May 3, 2012

Author: maven-release Date: 2012-05-03 15:14:18 +0200 (Thu, 03 May 2012) New Revision: 3360 Url: http://chorem.org/repositories/revision/pollen/3360 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-03 13:14:16 UTC (rev 3359) +++ trunk/pollen-persistence/pom.xml 2012-05-03 13:14:18 UTC (rev 3360) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</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-03 13:14:16 UTC (rev 3359) +++ trunk/pollen-services/pom.xml 2012-05-03 13:14:18 UTC (rev 3360) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</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-03 13:14:16 UTC (rev 3359) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-03 13:14:18 UTC (rev 3360) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> @@ -306,8 +306,7 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir - dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> + <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> </target> </configuration> <goals> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-03 13:14:16 UTC (rev 3359) +++ trunk/pollen-votecounting/pom.xml 2012-05-03 13:14:18 UTC (rev 3360) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</version> + <version>1.4-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-03 13:14:16 UTC (rev 3359) +++ trunk/pom.xml 2012-05-03 13:14:18 UTC (rev 3360) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3</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</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 + scm:svn:http://svn.chorem.org/svn/pollen/trunk </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3</url> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3359 - in tags: . pollen-1.3
by maven-release＠users.chorem.org May 3, 2012

May 3, 2012

Author: maven-release Date: 2012-05-03 15:14:16 +0200 (Thu, 03 May 2012) New Revision: 3359 Url: http://chorem.org/repositories/revision/pollen/3359 Log: [maven-release-plugin] copy for tag pollen-1.3 Added: tags/pollen-1.3/ Property changes on: tags/pollen-1.3 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

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

May 3, 2012

Author: maven-release Date: 2012-05-03 15:14:14 +0200 (Thu, 03 May 2012) New Revision: 3358 Url: http://chorem.org/repositories/revision/pollen/3358 Log: [maven-release-plugin] prepare release pollen-1.3 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-03 13:11:55 UTC (rev 3357) +++ trunk/pollen-persistence/pom.xml 2012-05-03 13:14:14 UTC (rev 3358) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-05-03 13:11:55 UTC (rev 3357) +++ trunk/pollen-services/pom.xml 2012-05-03 13:14:14 UTC (rev 3358) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-05-03 13:11:55 UTC (rev 3357) +++ trunk/pollen-ui-struts2/pom.xml 2012-05-03 13:14:14 UTC (rev 3358) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-05-03 13:11:55 UTC (rev 3357) +++ trunk/pollen-votecounting/pom.xml 2012-05-03 13:14:14 UTC (rev 3358) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-05-03 13:11:55 UTC (rev 3357) +++ trunk/pom.xml 2012-05-03 13:14:14 UTC (rev 3358) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</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</connection> <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/trunk + scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3 </developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3</url> </scm> <distributionManagement>

1 0