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

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

April 16, 2012

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

1 0

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

April 16, 2012

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

1 0

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

April 13, 2012

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

1 0

r3273 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:56:05 +0200 (Fri, 13 Apr 2012) New Revision: 3273 Url: http://chorem.org/repositories/revision/pollen/3273 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-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-services/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 17:56:03 UTC (rev 3272) +++ trunk/pom.xml 2012-04-13 17:56:05 UTC (rev 3273) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1</version> + <version>1.3-rc2-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -524,9 +524,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3-rc1</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement>

1 0

r3272 - in tags: . pollen-1.3-rc1
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:56:03 +0200 (Fri, 13 Apr 2012) New Revision: 3272 Url: http://chorem.org/repositories/revision/pollen/3272 Log: [maven-release-plugin] copy for tag pollen-1.3-rc1 Added: tags/pollen-1.3-rc1/ Property changes on: tags/pollen-1.3-rc1 ___________________________________________________________________ Added: svn:ignore + target nbactions.xml .settings .classpath .project *.ipr *.iws *.iml .idea Added: svn:mergeinfo +

1 0

r3271 - in trunk: . pollen-persistence pollen-services pollen-ui-struts2 pollen-votecounting
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:56:00 +0200 (Fri, 13 Apr 2012) New Revision: 3271 Url: http://chorem.org/repositories/revision/pollen/3271 Log: [maven-release-plugin] prepare release pollen-1.3-rc1 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-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-services/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) +++ trunk/pom.xml 2012-04-13 17:56:00 UTC (rev 3271) @@ -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> @@ -17,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-rc1-SNAPSHOT</version> + <version>1.3-rc1</version> <modules> <module>pollen-votecounting</module> @@ -526,9 +524,9 @@  <scm> - <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/tags/pollen-1.3-rc1</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/tags/pollen-1.3-rc1</url> </scm> <distributionManagement> @@ -617,7 +615,7 @@ <profiles> <profile> - <id>extra-modules</id> + <id>extra-modulesA</id> <modules> <module>pollen-domain</module>

1 0

r3270 - in trunk: pollen-persistence pollen-persistence/src/license pollen-services/src/license pollen-ui-struts2 pollen-ui-struts2/src/license pollen-votecounting pollen-votecounting/src/license
by maven-release＠users.chorem.org April 13, 2012

April 13, 2012

Author: maven-release Date: 2012-04-13 19:49:44 +0200 (Fri, 13 Apr 2012) New Revision: 3270 Url: http://chorem.org/repositories/revision/pollen/3270 Log: optimize dependencies + update third-parties Removed: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties Modified: trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/license/THIRD-PARTY.properties trunk/pollen-services/src/license/THIRD-PARTY.properties trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties trunk/pollen-votecounting/pom.xml Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -42,10 +42,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> - <dependency> +  <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> @@ -55,6 +55,10 @@ <artifactId>topia-service-migration</artifactId> </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> Modified: trunk/pollen-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-persistence/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -11,6 +11,8 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -18,10 +20,8 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:31:24 CET 2012 +#Fri Apr 13 19:35:55 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 Modified: trunk/pollen-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-services/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -13,6 +13,8 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - license.txt @@ -20,10 +22,10 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:32:21 CET 2012 +#Fri Apr 13 19:36:08 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -19,11 +19,11 @@ <artifactId>pollen-ui-struts2</artifactId> <dependencies> -  + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> @@ -116,6 +116,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-jfreechart-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -133,6 +134,32 @@ <artifactId>shiro-web</artifactId> </dependency> + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jfree</groupId> + <artifactId>jcommon</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> +  <dependency> <groupId>javax.servlet</groupId> Modified: trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-ui-struts2/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -4,17 +4,21 @@ # - Apache Software License - Version 2.0 # - BSD License # - BSD-style license +# - Bouncy Castle License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 +# - GNU Lesser General Public Licence # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDOM Apache-like license # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MPL 1.1 +# - Mozilla Public License +# - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -23,12 +27,12 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jan 30 01:33:46 CET 2012 +#Fri Apr 13 19:37:43 CEST 2012 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -javassist--javassist--3.10.0.GA=Lesser General Public License (LPGL) v 2.1 javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:49:44 UTC (rev 3270) @@ -31,10 +31,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> - <dependency> +  <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> Deleted: trunk/pollen-votecounting/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-04-13 17:46:37 UTC (rev 3269) +++ trunk/pollen-votecounting/src/license/THIRD-PARTY.properties 2012-04-13 17:49:44 UTC (rev 3270) @@ -1,19 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - BSD License -# - BSD style -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Mon Jan 30 01:22:54 CET 2012 -org.jdom--jdom--1.1=Lesser General Public License (LGPL) v 3.0

1 0

r3269 - in trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions: admin user
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 19:46:37 +0200 (Fri, 13 Apr 2012) New Revision: 3269 Url: http://chorem.org/repositories/revision/pollen/3269 Log: use commons-lang3 only Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 17:43:16 UTC (rev 3268) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/Confirm.java 2012-04-13 17:46:37 UTC (rev 3269) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.ui.actions.admin; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.services.impl.PollService; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 17:43:16 UTC (rev 3268) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Confirm.java 2012-04-13 17:46:37 UTC (rev 3269) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.ui.actions.user; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.services.impl.FavoriteService; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-13 17:43:16 UTC (rev 3268) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java 2012-04-13 17:46:37 UTC (rev 3269) @@ -1,6 +1,6 @@ package org.chorem.pollen.ui.actions.user; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.services.exceptions.UserNotFoundException; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.ui.actions.PollenActionSupport;

1 0

r3268 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions
by fdesbois＠users.chorem.org April 13, 2012

April 13, 2012

Author: fdesbois Date: 2012-04-13 19:43:16 +0200 (Fri, 13 Apr 2012) New Revision: 3268 Url: http://chorem.org/repositories/revision/pollen/3268 Log: remove useless logger Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java 2012-04-13 17:27:48 UTC (rev 3267) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/BooleanIntegerConverter.java 2012-04-13 17:43:16 UTC (rev 3268) @@ -24,8 +24,6 @@ package org.chorem.pollen.ui.actions; import org.apache.struts2.util.StrutsTypeConverter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.util.Map; @@ -33,12 +31,9 @@ * Created: 26/03/12 * * @author fdesbois <desbois(a)codelutin.com> - * $Id$ */ public class BooleanIntegerConverter extends StrutsTypeConverter { - private static final Logger log = LoggerFactory.getLogger(BooleanIntegerConverter.class); - @Override public Integer convertFromString(Map context, String[] values, Class toClass) { Integer result;

1 0

r3267 - in trunk: . pollen-business pollen-domain pollen-persistence pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-services pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/services/exceptions pollen-ui pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user pollen-ui-struts2/src/main/resources/template/themes pollen-ui
by tchemit＠users.chorem.org April 13, 2012

April 13, 2012

Author: tchemit Date: 2012-04-13 19:27:48 +0200 (Fri, 13 Apr 2012) New Revision: 3267 Url: http://chorem.org/repositories/revision/pollen/3267 Log: - change versions - add svn properties - add headers - use fluido maven skin Added: trunk/src/site/resources/maven-site-chorem.org.js Modified: trunk/pollen-business/pom.xml trunk/pollen-domain/pom.xml trunk/pollen-persistence/pom.xml trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java trunk/pollen-ui-struts2/src/main/resources/template/themes/README.txt trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp trunk/pollen-ui/pom.xml trunk/pollen-votecounting/pom.xml trunk/pom.xml trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-business/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-domain/pom.xml =================================================================== --- trunk/pollen-domain/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-domain/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-persistence/pom.xml =================================================================== --- trunk/pollen-persistence/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-persistence/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VotingListImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-services/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollUrl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/InvalidEmailException.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui/pom.xml =================================================================== --- trunk/pollen-ui/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.2.6-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui-struts2/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -12,7 +12,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PageSkin.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/LostPassword.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_flat_75_b0f580_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_368000_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_65_55cb00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_4bb300_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_55cb00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_glass_75_b0f580_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_highlight-soft_75_55cb00_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_17990a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_227c24_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_888888_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/green/jquery-ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_0_aaaaaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_flat_75_ffffaa_40x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_55_fbf9ee_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_65_ffcc00_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_fff71f_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_glass_75_ffff0f_1x400.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_highlight-soft_75_ffff0f_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-bg_inset-soft_95_fef1ec_1x100.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_222222_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_454545_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_cd0a0a_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_dcb104_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/images/ui-icons_ffcc00_256x240.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2/src/main/resources/template/themes/yellow/jquery-ui.css ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp 2012-04-13 17:27:48 UTC (rev 3267) @@ -2,8 +2,8 @@ #%L Pollen :: UI (strust2) - $Id: VotingList.jsp 3247 2012-04-11 14:23:26Z fdesbois $ - $HeadURL: http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2/pollen-ui-st… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin %% Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVotingListPersons.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/dialogLostPassword.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-votecounting/pom.xml =================================================================== --- trunk/pollen-votecounting/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pollen-votecounting/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/pom.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -17,7 +17,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3-rc1-SNAPSHOT</version> <modules> <module>pollen-votecounting</module> @@ -147,14 +147,14 @@ </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - <version>${shiroVersion}</version> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + <version>${shiroVersion}</version> </dependency> <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - <version>${shiroVersion}</version> + <groupId>org.apache.shiro</groupId> + <artifactId>shiro-web</artifactId> + <version>${shiroVersion}</version> </dependency> @@ -460,13 +460,15 @@ <shiroVersion>1.2.0</shiroVersion> <slf4jVersion>1.6.4</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> - +  <siteLocales>en,fr</siteLocales>  <license.licenseName>agpl_v3</license.licenseName> + <scmwebeditorEnabled>true</scmwebeditorEnabled> + </properties> <build> @@ -524,15 +526,9 @@  <scm> - <connection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 - </connection> - <developerConnection> - scm:svn:http://svn.chorem.org/svn/pollen/branches/pollen-1.2.6-struts2 - </developerConnection> - <url> - http://www.chorem.org/repositories/browse/pollen/branches/pollen-1.2.6-stru… - </url> + <connection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/pollen/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/pollen/trunk</url> </scm> <distributionManagement> @@ -544,29 +540,12 @@ <repositories> -  -  - -  -  -  <repository> <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -581,7 +560,7 @@ <repository> <id>nuiton.snapshot</id> <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -601,7 +580,7 @@ <id>nuiton.release</id> <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> + <url>http://nexus.nuiton.org/nexus/content/groups/public/</url> <snapshots> <enabled>false</enabled> </snapshots> @@ -616,7 +595,7 @@ <pluginRepository> <id>nuiton.snapshot</id> <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> + <url>http://nexus.nuiton.org/nexus/content/repositories/snapshots/</url> <snapshots> <enabled>true</enabled> <checksumPolicy>fail</checksumPolicy> @@ -635,4 +614,17 @@ </reporting> + <profiles> + + <profile> + <id>extra-modules</id> + + <modules> + <module>pollen-domain</module> + <module>pollen-business</module> + <module>pollen-ui</module> + </modules> + </profile> + </profiles> + </project> Added: trunk/src/site/resources/maven-site-chorem.org.js =================================================================== --- trunk/src/site/resources/maven-site-chorem.org.js (rev 0) +++ trunk/src/site/resources/maven-site-chorem.org.js 2012-04-13 17:27:48 UTC (rev 3267) @@ -0,0 +1,82 @@ +/* + * #%L + * EchoBase + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 - 2012 Ifremer, 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% + */ +$(document).ready(function () { + + var metas = $('#projectMetas'); + var piwikEnabled = metas.attr('piwikEnabled'); + if (piwikEnabled) { + //Piwik Tracking Code + var piwikId = metas.attr('piwikId'); + if (!piwikId) { + + // default piwikId for chorem.org + piwikId = 3; + } + + console.log("use Piwik with id = " + piwikId); + var pkBaseURL = "https:" == document.location.protocol ? + "https://piwik.codelutin.com/" : + "http://piwik.codelutin.com/"; + $.getScript(pkBaseURL + "piwik.js", function (data, textStatus, jqxhr) { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", piwikId); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + console.log("piwikTracker loaded = " + piwikTracker); + }); + //Piwik Tracking Code + } + var scmwebeditorenabled = metas.attr('scmwebeditorenabled'); + var scm = metas.attr('scm'); + if (scmwebeditorenabled && scm.indexOf("/trunk") > -1) { + + // allow scmwebeditor is enabled and on trunk + + var scmurl = metas.attr('scmwebeditorurl'); + var projectId = metas.attr('projectId'); + var siteSourcesType = metas.attr('siteSourcesType'); + var path; + var pathname = document.location.pathname; + if (pathname.indexOf('target/site') > 0) { + path = pathname.substr(pathname.indexOf('/site')). + replace('/site/', ''); + } else { + if (pathname == '/' + projectId + '/') { + // on / page + path = 'index.html'; + } else { + path = pathname.substr(pathname.indexOf('/' + projectId)). + replace('/' + projectId + '/', ''); + } + } + path = path.replace('.html', '.' + siteSourcesType); + var url = scmurl + "?address=" + scm + "/src/site/" + siteSourcesType + "/" + path; + console.log("Add scmwebeditor with url = " + url); + var html = "<li class='pull-right'><a href='" + url + + "'>Éditer la page</a></li>" + + "<li class='divider pull-right'>|</li>"; + var ul = $('#publishDate'); + ul.prepend(html); + + } +}); \ No newline at end of file Property changes on: trunk/src/site/resources/maven-site-chorem.org.js ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/src/site/site_en.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -25,8 +25,6 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -37,6 +35,35 @@ <href>http://www.codelutin.com</href> </bannerRight> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>http://www.codelutin.com</href> + </bannerRight> + + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> @@ -94,7 +121,24 @@  <menu ref="reports"/> + <footer> + <script type="text/javascript" src="./maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> - -</project> + </project> + Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-04-13 16:52:34 UTC (rev 3266) +++ trunk/src/site/site_fr.xml 2012-04-13 17:27:48 UTC (rev 3267) @@ -25,8 +25,6 @@ <project name="${project.name}"> - <publishDate format="dd/MM/yyyy"/> - <bannerLeft> <name>${project.name}</name> <href>index.html</href> @@ -37,6 +35,25 @@ <href>http://www.codelutin.com</href> </bannerRight> + <skin> + <groupId>org.apache.maven.skins</groupId> + <artifactId>maven-fluido-skin</artifactId> + <version>1.2.1</version> + </skin> + + <custom> + <fluidoSkin> + <topBarEnabled>true</topBarEnabled> + <googleSearch/> + <sideBarEnabled>false</sideBarEnabled> + <searchEnabled>true</searchEnabled> + <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> + </fluidoSkin> + </custom> + + <publishDate position="right" format="dd/MM/yyyy"/> + <version position="right" /> + <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="http://maven-site.nuiton.org/jrst/images/logos/maven-feather.png"/> <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="http://maven-site.nuiton.org/jrst/images/jrst-logo.png"/> @@ -92,6 +109,24 @@  <menu ref="reports"/> + <footer> + + <script type="text/javascript" src="./maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.url}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + </body> </project>

1 0