Pollen-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 3196 discussions
r3135 - in branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services: . impl
by tchemitï¼ users.chorem.org 22 Feb '12
by tchemitï¼ users.chorem.org 22 Feb '12
22 Feb '12
Author: tchemit
Date: 2012-02-22 13:07:31 +0100 (Wed, 22 Feb 2012)
New Revision: 3135
Url: http://chorem.org/repositories/revision/pollen/3135
Log:
use nuiton-struts2 filter pager bean + improve some code
Removed:
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java
Modified:
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java
Deleted: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-02-22 12:06:41 UTC (rev 3134)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-02-22 12:07:31 UTC (rev 3135)
@@ -1,94 +0,0 @@
-/*
- * #%L
- * Pollen :: Services
- *
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
-package org.chorem.pollen.services;
-
-import org.apache.commons.lang3.StringUtils;
-import org.nuiton.topia.framework.TopiaQuery;
-import org.nuiton.util.PagerUtil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Override nuiton pager while adding sort informations.
- * <p/>
- * Maybe this should be push back to nuiton ?
- *
- * @author tchemit <chemit(a)codelutin.com>
- * @since 1.2.6
- */
-public class PollenPagerBean extends PagerUtil.PagerBean {
-
- private static final long serialVersionUID = 1L;
-
- // sorting order - asc or desc
- protected boolean sortAscendant;
-
- // get index row - i.e. user click to sort.
- protected String sortColumn;
-
- public boolean isSortAscendant() {
- return sortAscendant;
- }
-
- public void setSortAscendant(boolean sortAscendant) {
- this.sortAscendant = sortAscendant;
- }
-
- public String getSortColumn() {
- return sortColumn;
- }
-
- public void setSortColumn(String sortColumn) {
- this.sortColumn = sortColumn;
- }
-
- public static TopiaQuery addPagerToQuery(TopiaQuery query,
- PollenPagerBean pager) {
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- query.setLimit(pager.getRecordStartIndex(),
- pager.getRecordEndIndex() - 1);
-
- if (StringUtils.isNotEmpty(pager.getSortColumn())) {
- if (pager.isSortAscendant()) {
- query.addOrder(pager.getSortColumn());
- } else {
- query.addOrderDesc(pager.getSortColumn());
- }
- }
- return query;
- }
-
- public static <E> List<E> getPageFromList(List<E> elements,
- PollenPagerBean pager) {
-
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- List<E> subList = elements.subList(pager.getRecordStartIndex(),
- pager.getRecordEndIndex());
- List<E> result = new ArrayList<E>(subList);
-
- return result;
- }
-
-}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-02-22 12:06:41 UTC (rev 3134)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-02-22 12:07:31 UTC (rev 3135)
@@ -83,6 +83,24 @@
}
}
+ public <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(Class<T> entityType) {
+ Preconditions.checkNotNull(entityType);
+ try {
+ D dao = PollenDAOHelper.getDAO(getTransaction(), entityType);
+ return dao;
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException("Could not obtain dao of type " + entityType.getName(), e);
+ }
+ }
+
+ protected <T extends TopiaEntity, D extends TopiaDAO<? super T>> T newInstance(D dao) {
+ try {
+ return (T) dao.newInstance();
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException("Could not obtain new instance from dao " + dao, e);
+ }
+ }
+
protected TopiaContext getTransaction() {
return serviceContext.getTransaction();
}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-02-22 12:06:41 UTC (rev 3134)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-02-22 12:07:31 UTC (rev 3135)
@@ -23,6 +23,7 @@
*/
package org.chorem.pollen.services.impl;
+import com.google.common.base.Preconditions;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.mail.EmailException;
@@ -39,6 +40,11 @@
public void sendEmail(String to,
String subject,
String content) {
+
+ Preconditions.checkNotNull(to);
+ Preconditions.checkNotNull(subject);
+ Preconditions.checkNotNull(content);
+
try {
// Create the SimpleEmail to send
SimpleEmail email = createSimpleEmail(to, subject, content);
@@ -65,6 +71,11 @@
String to,
String subject,
String content) throws EmailException {
+
+ Preconditions.checkNotNull(to);
+ Preconditions.checkNotNull(subject);
+ Preconditions.checkNotNull(content);
+
PollenConfiguration configuration = getConfiguration();
SimpleEmail result = new SimpleEmail();
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-02-22 12:06:41 UTC (rev 3134)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-02-22 12:07:31 UTC (rev 3135)
@@ -23,15 +23,368 @@
*/
package org.chorem.pollen.services.impl;
+import com.google.common.base.Preconditions;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.chorem.pollen.PollenTechnicalException;
+import org.chorem.pollen.business.persistence.PersonList;
+import org.chorem.pollen.business.persistence.PersonListDAO;
+import org.chorem.pollen.business.persistence.PollAccount;
+import org.chorem.pollen.business.persistence.PollAccountDAO;
+import org.chorem.pollen.business.persistence.UserAccount;
+import org.chorem.pollen.business.persistence.UserAccountDAO;
import org.chorem.pollen.services.PollenServiceSupport;
+import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException;
+import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException;
+import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException;
+import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException;
+import org.chorem.pollen.services.exceptions.ParticipantNotFoundException;
+import org.chorem.pollen.services.exceptions.ParticipantNotFoundInListException;
+import org.chorem.pollen.services.exceptions.UserNotFoundException;
+import org.nuiton.topia.TopiaException;
+import org.nuiton.topia.framework.TopiaQuery;
+import org.nuiton.web.struts2.FilterPagerUtil;
+import java.util.List;
+
public class FavoriteService extends PollenServiceSupport {
/** Logger. */
private static final Log log = LogFactory.getLog(FavoriteService.class);
+ public List<PersonList> getFavoriteLists(UserAccount user,
+ FilterPagerUtil.FilterPagerBean pager) {
+
+ Preconditions.checkNotNull(user);
+
+ PersonListDAO dao = getDAO(PersonList.class);
+
+ try {
+
+ TopiaQuery countQuery = dao.createQuery("e");
+ countQuery.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
+ long records = dao.countByQuery(countQuery);
+
+ pager.setRecords((int) records);
+
+ TopiaQuery query = FilterPagerUtil.addPagerToQuery(countQuery, pager);
+
+ List<PersonList> result = dao.findAllByQuery(query);
+ return result;
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public List<PersonList> getFavoriteLists(UserAccount user) {
+
+ Preconditions.checkNotNull(user);
+
+ PersonListDAO dao = getDAO(PersonList.class);
+
+ try {
+
+ TopiaQuery query = dao.createQuery("e");
+ query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
+ List<PersonList> result = dao.findAllByQuery(query);
+ return result;
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public PersonList getFavoriteList(UserAccount user,
+ String favoriteListId) throws FavoriteListNotFoundException, FavoriteListNotOwnedByUserException {
+
+ Preconditions.checkNotNull(user);
+ Preconditions.checkNotNull(favoriteListId);
+
+ PersonListDAO dao = getDAO(PersonList.class);
+
+ try {
+
+ PersonList favoriteList = dao.findByTopiaId(favoriteListId);
+
+ if (favoriteList == null) {
+ throw new FavoriteListNotFoundException();
+ }
+
+ // check this favorite belongs to the given user
+ UserAccount favoriteListOwner = favoriteList.getOwner();
+ if (!favoriteListOwner.equals(user)) {
+ throw new FavoriteListNotOwnedByUserException();
+ }
+
+ return favoriteList;
+
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public List<PollAccount> getFavoriteListUsers(PersonList favoriteList,
+ FilterPagerUtil.FilterPagerBean pager) {
+
+ Preconditions.checkNotNull(favoriteList);
+ Preconditions.checkNotNull(pager);
+
+ PollAccountDAO dao = getDAO(PollAccount.class);
+
+ try {
+
+ int records = favoriteList.sizePollAccount();
+ pager.setRecords(records);
+
+ TopiaQuery query = dao.createQuery("e");
+ FilterPagerUtil.addPagerToQuery(query, pager);
+ query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList);
+
+ List<PollAccount> result = dao.findAllByQuery(query);
+ return result;
+
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public void createFavoriteList(UserAccount user,
+ String name) throws FavoriteListAlreadyExistException, UserNotFoundException {
+
+ Preconditions.checkNotNull(user);
+ Preconditions.checkNotNull(name);
+
+ // can't accept favorite list without name
+ Preconditions.checkArgument(StringUtils.isNotEmpty(name));
+
+ UserAccountDAO userDAO = getDAO(UserAccount.class);
+ PersonListDAO dao = getDAO(PersonList.class);
+
+ try {
+
+ UserAccount userToUse =
+ userDAO.findByTopiaId(user.getTopiaId());
+
+ if (userToUse == null) {
+ throw new UserNotFoundException();
+ }
+
+ // check list does not already exists
+
+ TopiaQuery query = dao.createQuery("e");
+
+ query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
+ query.addWhere("e." + PersonList.PROPERTY_NAME, TopiaQuery.Op.EQ, name);
+
+ boolean exist = dao.existByQuery(query);
+
+ if (exist) {
+
+ throw new FavoriteListAlreadyExistException();
+ }
+
+ PersonList favoriteListCreated = dao.create(
+ PersonList.PROPERTY_OWNER, userToUse
+ );
+ favoriteListCreated.setName(name);
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public PersonList deleteFavoriteList(UserAccount user,
+ PersonList favoriteList) throws FavoriteListNotFoundException, FavoriteListNotOwnedByUserException, UserNotFoundException {
+
+ Preconditions.checkNotNull(user);
+ Preconditions.checkNotNull(favoriteList);
+
+ UserAccountDAO userDAO = getDAO(UserAccount.class);
+ PersonListDAO dao = getDAO(PersonList.class);
+
+ try {
+
+ UserAccount userToUse =
+ userDAO.findByTopiaId(user.getTopiaId());
+
+ if (userToUse == null) {
+ throw new UserNotFoundException();
+ }
+
+ PersonList favoriteListToDelete =
+ dao.findByTopiaId(favoriteList.getTopiaId());
+
+ if (favoriteListToDelete == null) {
+ throw new FavoriteListNotFoundException();
+ }
+
+ // check this favorite belongs to the given user
+ UserAccount favoriteListOwner = favoriteListToDelete.getOwner();
+ if (!favoriteListOwner.equals(user)) {
+ throw new FavoriteListNotOwnedByUserException();
+ }
+
+ dao.delete(favoriteListToDelete);
+ return favoriteListToDelete;
+
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public void addPollAccountToFavoriteList(PersonList favoriteList,
+ PollAccount pollAccount) throws ParticipantAlreadyFoundInListException, FavoriteListNotFoundException {
+
+ Preconditions.checkNotNull(favoriteList);
+ Preconditions.checkNotNull(pollAccount);
+
+ // can't accept poll account without name
+ Preconditions.checkArgument(
+ StringUtils.isNotEmpty(pollAccount.getVotingId()));
+
+ // can't accept poll account without email
+ Preconditions.checkArgument(
+ StringUtils.isNotEmpty(pollAccount.getEmail()));
+
+ PollAccountDAO dao = getDAO(PollAccount.class);
+ PersonListDAO personListDAO = getDAO(PersonList.class);
+
+ try {
+
+ PersonList personListToUpdate =
+ personListDAO.findByTopiaId(favoriteList.getTopiaId());
+
+ if (personListToUpdate == null) {
+ throw new FavoriteListNotFoundException();
+ }
+
+ // check there is other poll account in this list with same id
+ TopiaQuery query = dao.createQuery("e");
+ query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate);
+ query.addWhere("e." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, pollAccount.getVotingId());
+ boolean pollAccountExists = dao.existByQuery(query);
+ if (pollAccountExists) {
+
+ throw new ParticipantAlreadyFoundInListException();
+ }
+
+ PollAccount pollAccountCreated =
+ dao.create(PollAccount.PROPERTY_PERSON_LIST,
+ personListToUpdate);
+
+ pollAccountCreated.setVotingId(pollAccount.getVotingId());
+ pollAccountCreated.setEmail(pollAccount.getEmail());
+ personListToUpdate.addPollAccount(pollAccountCreated);
+
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public void editPollAccountToFavoriteList(PersonList favoriteList,
+ PollAccount pollAccount) throws ParticipantAlreadyFoundInListException, FavoriteListNotFoundException, ParticipantNotFoundException {
+
+ Preconditions.checkNotNull(favoriteList);
+ Preconditions.checkNotNull(pollAccount);
+
+ // can't accept poll account without name
+ Preconditions.checkArgument(
+ StringUtils.isNotEmpty(pollAccount.getVotingId()));
+
+ // can't accept poll account without email
+ Preconditions.checkArgument(
+ StringUtils.isNotEmpty(pollAccount.getEmail()));
+
+ PollAccountDAO dao = getDAO(PollAccount.class);
+ PersonListDAO personListDAO = getDAO(PersonList.class);
+
+ try {
+
+ PersonList personListToUpdate =
+ personListDAO.findByTopiaId(favoriteList.getTopiaId());
+
+ if (personListToUpdate == null) {
+ throw new FavoriteListNotFoundException();
+ }
+
+ PollAccount pollAccountToUpdate =
+ dao.findByTopiaId(pollAccount.getTopiaId());
+
+ if (pollAccountToUpdate == null) {
+ throw new ParticipantNotFoundException();
+ }
+
+ // check there is another poll account in this list with same id
+ TopiaQuery query = dao.createQuery("e");
+ query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate);
+ query.addWhere("e." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, pollAccount.getVotingId());
+ query.addWhere("e." + PollAccount.TOPIA_ID, TopiaQuery.Op.NEQ, pollAccount.getTopiaId());
+ boolean pollAccountExists = dao.existByQuery(query);
+ if (pollAccountExists) {
+
+ throw new ParticipantAlreadyFoundInListException();
+ }
+
+ pollAccountToUpdate.setVotingId(pollAccount.getVotingId());
+ pollAccountToUpdate.setEmail(pollAccount.getEmail());
+
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public void removePollAccountToFavoriteList(PersonList favoriteList,
+ PollAccount pollAccount) throws ParticipantNotFoundException, FavoriteListNotFoundException, ParticipantNotFoundInListException {
+
+ Preconditions.checkNotNull(favoriteList);
+ Preconditions.checkNotNull(pollAccount);
+
+ PollAccountDAO dao = getDAO(PollAccount.class);
+ PersonListDAO personListDAO = getDAO(PersonList.class);
+
+ try {
+
+ PersonList personListToUpdate =
+ personListDAO.findByTopiaId(favoriteList.getTopiaId());
+
+ if (personListToUpdate == null) {
+ throw new FavoriteListNotFoundException();
+ }
+
+ PollAccount pollAccountToRemove =
+ dao.findByTopiaId(pollAccount.getTopiaId());
+
+ if (pollAccountToRemove == null) {
+
+ throw new ParticipantNotFoundException();
+ }
+
+ PollAccount pollAccountInList =
+ personListToUpdate.getPollAccountByTopiaId(pollAccount.getTopiaId());
+
+ if (pollAccountInList == null) {
+
+ throw new ParticipantNotFoundInListException();
+ }
+
+ personListToUpdate.removePollAccount(pollAccountToRemove);
+
+ } catch (TopiaException e) {
+ throw new PollenTechnicalException(e);
+ }
+ }
+
+ public PersonList newFavoriteList() {
+ PersonListDAO dao = getDAO(PersonList.class);
+ PersonList personList = newInstance(dao);
+ return personList;
+ }
+
+ public PollAccount newPollAccountForFavoriteList() {
+ PollAccountDAO dao = getDAO(PollAccount.class);
+ PollAccount pollAccount = newInstance(dao);
+ return pollAccount;
+ }
+
// public void createFavoriteParticipant(FavoriteParticipant participant) throws ParticipantExistWithoutMailException, ParticipantAlreadyFoundInListException {
// try {
// FavoriteParticipantDAO dao =
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-02-22 12:06:41 UTC (rev 3134)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-02-22 12:07:31 UTC (rev 3135)
@@ -23,6 +23,7 @@
*/
package org.chorem.pollen.services.impl;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -31,18 +32,16 @@
import org.chorem.pollen.business.persistence.PersonToList;
import org.chorem.pollen.business.persistence.Poll;
import org.chorem.pollen.business.persistence.PollAccount;
-import org.chorem.pollen.business.persistence.PollAccountImpl;
+import org.chorem.pollen.business.persistence.PollAccountDAO;
import org.chorem.pollen.business.persistence.PollDAO;
-import org.chorem.pollen.business.persistence.PollImpl;
import org.chorem.pollen.business.persistence.UserAccount;
import org.chorem.pollen.business.persistence.Vote;
import org.chorem.pollen.business.persistence.VoteDAO;
import org.chorem.pollen.business.persistence.VotingList;
-import org.chorem.pollen.entities.PollenDAOHelper;
-import org.chorem.pollen.services.PollenPagerBean;
import org.chorem.pollen.services.PollenServiceSupport;
import org.nuiton.topia.TopiaException;
import org.nuiton.topia.framework.TopiaQuery;
+import org.nuiton.web.struts2.FilterPagerUtil;
import java.util.List;
@@ -58,8 +57,10 @@
* @return Build a new Poll instance with given {@code user} as administrator
*/
public Poll getNewPoll(UserAccount user) {
- Poll result = new PollImpl();
+ PollDAO pollDAO = getDAO(Poll.class);
+ Poll result = newInstance(pollDAO);
+
PollenConfiguration configuration = getConfiguration();
// default values from configuration
@@ -68,7 +69,8 @@
result.setPollType(configuration.getDefaultPollType());
// Initialize creator as an admin for the poll
- PollAccount creator = new PollAccountImpl();
+ PollAccountDAO pollAccountDAO = getDAO(PollAccount.class);
+ PollAccount creator = newInstance(pollAccountDAO);
// creator.setAdmin(true);
if (user != null) {
// Link the creator with the user
@@ -83,16 +85,19 @@
return result;
}
- public List<Poll> getPolls(PollenPagerBean pager) {
+ public List<Poll> getPolls(FilterPagerUtil.FilterPagerBean pager) {
+ Preconditions.checkNotNull(pager);
+
+ PollDAO dao = getDAO(Poll.class);
+
try {
- PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction());
long records = dao.count();
pager.setRecords((int) records);
TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(query, pager);
+ FilterPagerUtil.addPagerToQuery(query, pager);
List<Poll> result = dao.findAllByQuery(query);
return result;
@@ -101,17 +106,21 @@
}
}
- public List<Poll> getCreatedPolls(PollenPagerBean pager, UserAccount user) {
+ public List<Poll> getCreatedPolls(FilterPagerUtil.FilterPagerBean pager, UserAccount user) {
+ Preconditions.checkNotNull(pager);
+ Preconditions.checkNotNull(user);
+
+ PollDAO dao = getDAO(Poll.class);
+
try {
- PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction());
TopiaQuery countQuery = dao.createQuery("e");
countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
long records = dao.countByQuery(countQuery);
pager.setRecords((int) records);
- TopiaQuery query = PollenPagerBean.addPagerToQuery(countQuery, pager);
+ TopiaQuery query = FilterPagerUtil.addPagerToQuery(countQuery, pager);
List<Poll> result = dao.findAllByQuery(query);
return result;
@@ -120,8 +129,11 @@
}
}
- public List<Poll> getInvitedPolls(PollenPagerBean pager, UserAccount user) {
+ public List<Poll> getInvitedPolls(FilterPagerUtil.FilterPagerBean pager, UserAccount user) {
+ Preconditions.checkNotNull(pager);
+ Preconditions.checkNotNull(user);
+
UserService userService = newService(UserService.class);
UserAccount userToUse = userService.getEntityById(UserAccount.class, user.getTopiaId());
@@ -152,7 +164,7 @@
int records = allPolls.size();
pager.setRecords(records);
- List<Poll> result = PollenPagerBean.getPageFromList(allPolls, pager);
+ List<Poll> result = FilterPagerUtil.getPageFromList(allPolls, pager);
return result;
// try {
@@ -164,7 +176,7 @@
//
// PagerUtil.computeRecordIndexesAndPagesNumber(pager);
// TopiaQuery query = dao.createQuery("e");
-// PollenPagerBean.addPagerToQuery(pager, query);
+// FilterPagerUtil.addPagerToQuery(pager, query);
// query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
//
// List<Poll> result = dao.findAllByQuery(query);
@@ -174,9 +186,12 @@
// }
}
- public List<Poll> getParticipatedPolls(PollenPagerBean pager,
+ public List<Poll> getParticipatedPolls(FilterPagerUtil.FilterPagerBean pager,
UserAccount user) {
+ Preconditions.checkNotNull(pager);
+ Preconditions.checkNotNull(user);
+
//FIXME Use a query to do this to avoid in memory pagination
UserService userService = newService(UserService.class);
@@ -195,13 +210,14 @@
// int records = allPolls.size();
// pager.setRecords(records);
// PagerUtil.computeRecordIndexesAndPagesNumber(pager);
-// List<Poll> result = PollenPagerBean.getPageFromList(allPolls, pager);
+// List<Poll> result = FilterPagerUtil.getPageFromList(allPolls, pager);
// return result;
+ PollDAO pollDao = getDAO(Poll.class);
+ VoteDAO voteDao = getDAO(Vote.class);
+
try {
- PollDAO pollDao = PollenDAOHelper.getPollDAO(getTransaction());
- VoteDAO voteDao = PollenDAOHelper.getVoteDAO(getTransaction());
TopiaQuery countQuery = voteDao.createQuery("e").
addDistinct().
@@ -211,7 +227,7 @@
long records = pollDao.countByQuery(countQuery);
pager.setRecords((int) records);
- TopiaQuery query = PollenPagerBean.addPagerToQuery(countQuery, pager);
+ TopiaQuery query = FilterPagerUtil.addPagerToQuery(countQuery, pager);
// query.addDistinct();
// query.setSelect("e." + Vote.PROPERTY_POLL);
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-02-22 12:06:41 UTC (rev 3134)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-02-22 12:07:31 UTC (rev 3135)
@@ -29,25 +29,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.pollen.PollenTechnicalException;
-import org.chorem.pollen.business.persistence.PersonList;
-import org.chorem.pollen.business.persistence.PersonListDAO;
-import org.chorem.pollen.business.persistence.PersonListImpl;
-import org.chorem.pollen.business.persistence.PollAccount;
-import org.chorem.pollen.business.persistence.PollAccountDAO;
-import org.chorem.pollen.business.persistence.PollAccountImpl;
import org.chorem.pollen.business.persistence.UserAccount;
import org.chorem.pollen.business.persistence.UserAccountDAO;
-import org.chorem.pollen.business.persistence.UserAccountImpl;
import org.chorem.pollen.entities.PollenBinderHelper;
-import org.chorem.pollen.entities.PollenDAOHelper;
-import org.chorem.pollen.services.PollenPagerBean;
import org.chorem.pollen.services.PollenServiceSupport;
-import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException;
-import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException;
-import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException;
-import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException;
-import org.chorem.pollen.services.exceptions.ParticipantNotFoundException;
-import org.chorem.pollen.services.exceptions.ParticipantNotFoundInListException;
import org.chorem.pollen.services.exceptions.UserEmailAlreadyUsedException;
import org.chorem.pollen.services.exceptions.UserInvalidPasswordException;
import org.chorem.pollen.services.exceptions.UserLoginAlreadyUsedException;
@@ -57,6 +42,7 @@
import org.nuiton.topia.persistence.util.TopiaEntityBinder;
import org.nuiton.util.StringUtil;
import org.nuiton.util.beans.Binder;
+import org.nuiton.web.struts2.FilterPagerUtil;
import java.net.URL;
import java.util.List;
@@ -71,9 +57,13 @@
private static final Log log = LogFactory.getLog(UserService.class);
public UserAccount connect(String login, String password) throws UserNotFoundException, UserInvalidPasswordException {
+
+ Preconditions.checkNotNull(login);
+ Preconditions.checkNotNull(password);
+
+ UserAccountDAO dao = getDAO(UserAccount.class);
+
try {
- UserAccountDAO dao =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
UserAccount user = dao.findByLogin(login);
@@ -96,12 +86,14 @@
boolean byAdmin,
URL url) throws UserLoginAlreadyUsedException, UserEmailAlreadyUsedException {
+ Preconditions.checkNotNull(user);
+
String password = user.getPassword(); // le mot de passe en clair
+ UserAccountDAO dao = getDAO(UserAccount.class);
+
UserAccount userAccount;
try {
- UserAccountDAO dao =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
UserAccount userByLogin = dao.findByLogin(user.getLogin());
if (userByLogin != null) {
@@ -153,11 +145,12 @@
String newPassword,
boolean byAdmin) throws UserEmailAlreadyUsedException, UserInvalidPasswordException {
- try {
+ Preconditions.checkNotNull(user);
- UserAccountDAO dao =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
+ UserAccountDAO dao = getDAO(UserAccount.class);
+ try {
+
UserAccount userToUpdate = dao.findByTopiaId(user.getTopiaId());
// Do not manage password for an admin update
@@ -200,14 +193,18 @@
}
public UserAccount getNewUser() {
- UserAccount result = new UserAccountImpl();
+ UserAccountDAO dao = getDAO(UserAccount.class);
+ UserAccount result = newInstance(dao);
return result;
}
public void deleteUser(String id) throws UserNotFoundException {
+
+ Preconditions.checkNotNull(id);
+
+ UserAccountDAO dao = getDAO(UserAccount.class);
+
try {
- UserAccountDAO dao =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
UserAccount user = dao.findByTopiaId(id);
if (user == null) {
@@ -219,17 +216,19 @@
}
}
- public List<UserAccount> getUsers(PollenPagerBean pager) {
+ public List<UserAccount> getUsers(FilterPagerUtil.FilterPagerBean pager) {
+ Preconditions.checkNotNull(pager);
+
+ UserAccountDAO dao = getDAO(UserAccount.class);
+
try {
- UserAccountDAO dao =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
long records = dao.count();
pager.setRecords((int) records);
TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(query, pager);
+ FilterPagerUtil.addPagerToQuery(query, pager);
List<UserAccount> result = dao.findAllByQuery(query);
return result;
@@ -238,336 +237,11 @@
}
}
- public List<PersonList> getFavoriteLists(UserAccount user,
- PollenPagerBean pager) {
+ public int getNbUsers() {
- try {
+ UserAccountDAO dao = getDAO(UserAccount.class);
- PersonListDAO dao =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- TopiaQuery countQuery = dao.createQuery("e");
- countQuery.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
- long records = dao.countByQuery(countQuery);
-
- pager.setRecords((int) records);
-
- TopiaQuery query = PollenPagerBean.addPagerToQuery(countQuery, pager);
-
- List<PersonList> result = dao.findAllByQuery(query);
- return result;
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public List<PersonList> getFavoriteLists(UserAccount user) {
try {
-
- PersonListDAO dao =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- TopiaQuery query = dao.createQuery("e");
- query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
- List<PersonList> result = dao.findAllByQuery(query);
- return result;
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public PersonList getFavoriteList(UserAccount user,
- String favoriteListId) throws FavoriteListNotFoundException, FavoriteListNotOwnedByUserException {
- try {
-
- PersonListDAO dao =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- PersonList favoriteList = dao.findByTopiaId(favoriteListId);
-
- if (favoriteList == null) {
- throw new FavoriteListNotFoundException();
- }
-
- // check this favorite belongs to the given user
- UserAccount favoriteListOwner = favoriteList.getOwner();
- if (!favoriteListOwner.equals(user)) {
- throw new FavoriteListNotOwnedByUserException();
- }
-
- return favoriteList;
-
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public List<PollAccount> getFavoriteListUsers(PersonList favoriteList,
- PollenPagerBean pager) {
-
- Preconditions.checkNotNull(favoriteList);
- Preconditions.checkNotNull(pager);
- try {
-
- int records = favoriteList.sizePollAccount();
- pager.setRecords(records);
-
- PollAccountDAO dao =
- PollenDAOHelper.getPollAccountDAO(getTransaction());
-
- TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(query, pager);
- query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList);
-
- List<PollAccount> result = dao.findAllByQuery(query);
- return result;
-
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public void createFavoriteList(UserAccount user,
- String name) throws FavoriteListAlreadyExistException, UserNotFoundException {
-
- Preconditions.checkNotNull(user);
- Preconditions.checkNotNull(name);
-
- // can't accept favorite list without name
- Preconditions.checkArgument(StringUtils.isNotEmpty(name));
- try {
-
- UserAccountDAO userDAO =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
-
- UserAccount userToUse =
- userDAO.findByTopiaId(user.getTopiaId());
-
- if (userToUse == null) {
- throw new UserNotFoundException();
- }
-
- PersonListDAO dao =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- // check list does not already exists
-
- TopiaQuery query = dao.createQuery("e");
-
- query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
- query.addWhere("e." + PersonList.PROPERTY_NAME, TopiaQuery.Op.EQ, name);
-
- boolean exist = dao.existByQuery(query);
-
- if (exist) {
-
- throw new FavoriteListAlreadyExistException();
- }
-
- PersonList favoriteListCreated = dao.create(
- PersonList.PROPERTY_OWNER, userToUse
- );
- favoriteListCreated.setName(name);
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public PersonList deleteFavoriteList(UserAccount user,
- PersonList favoriteList) throws FavoriteListNotFoundException, FavoriteListNotOwnedByUserException, UserNotFoundException {
- try {
-
- Preconditions.checkNotNull(user);
- Preconditions.checkNotNull(favoriteList);
-
- UserAccountDAO userDAO =
- PollenDAOHelper.getUserAccountDAO(getTransaction());
-
- UserAccount userToUse =
- userDAO.findByTopiaId(user.getTopiaId());
-
- if (userToUse == null) {
- throw new UserNotFoundException();
- }
-
- PersonListDAO dao =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- PersonList favoriteListToDelete =
- dao.findByTopiaId(favoriteList.getTopiaId());
-
- if (favoriteListToDelete == null) {
- throw new FavoriteListNotFoundException();
- }
-
- // check this favorite belongs to the given user
- UserAccount favoriteListOwner = favoriteListToDelete.getOwner();
- if (!favoriteListOwner.equals(user)) {
- throw new FavoriteListNotOwnedByUserException();
- }
-
- dao.delete(favoriteListToDelete);
- return favoriteListToDelete;
-
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public void addPollAccountToFavoriteList(PersonList favoriteList,
- PollAccount pollAccount) throws ParticipantAlreadyFoundInListException, FavoriteListNotFoundException {
-
- Preconditions.checkNotNull(favoriteList);
- Preconditions.checkNotNull(pollAccount);
-
- // can't accept poll account without name
- Preconditions.checkArgument(
- StringUtils.isNotEmpty(pollAccount.getVotingId()));
-
- // can't accept poll account without email
- Preconditions.checkArgument(
- StringUtils.isNotEmpty(pollAccount.getEmail()));
-
- try {
-
- PersonListDAO personListDAO =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- PersonList personListToUpdate =
- personListDAO.findByTopiaId(favoriteList.getTopiaId());
-
- if (personListToUpdate == null) {
- throw new FavoriteListNotFoundException();
- }
-
- PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(getTransaction());
-
- // check there is other poll account in this list with same id
- TopiaQuery query = dao.createQuery("e");
- query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate);
- query.addWhere("e." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, pollAccount.getVotingId());
- boolean pollAccountExists = dao.existByQuery(query);
- if (pollAccountExists) {
-
- throw new ParticipantAlreadyFoundInListException();
- }
-
- PollAccount pollAccountCreated =
- dao.create(PollAccount.PROPERTY_PERSON_LIST,
- personListToUpdate);
-
- pollAccountCreated.setVotingId(pollAccount.getVotingId());
- pollAccountCreated.setEmail(pollAccount.getEmail());
- personListToUpdate.addPollAccount(pollAccountCreated);
-
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public void editPollAccountToFavoriteList(PersonList favoriteList,
- PollAccount pollAccount) throws ParticipantAlreadyFoundInListException, FavoriteListNotFoundException, ParticipantNotFoundException {
-
- Preconditions.checkNotNull(favoriteList);
- Preconditions.checkNotNull(pollAccount);
-
- // can't accept poll account without name
- Preconditions.checkArgument(
- StringUtils.isNotEmpty(pollAccount.getVotingId()));
-
- // can't accept poll account without email
- Preconditions.checkArgument(
- StringUtils.isNotEmpty(pollAccount.getEmail()));
-
- try {
-
- PersonListDAO personListDAO =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- PersonList personListToUpdate =
- personListDAO.findByTopiaId(favoriteList.getTopiaId());
-
- if (personListToUpdate == null) {
- throw new FavoriteListNotFoundException();
- }
-
- PollAccountDAO dao =
- PollenDAOHelper.getPollAccountDAO(getTransaction());
-
-
- PollAccount pollAccountToUpdate =
- dao.findByTopiaId(pollAccount.getTopiaId());
-
- if (pollAccountToUpdate == null) {
- throw new ParticipantNotFoundException();
- }
-
- // check there is another poll account in this list with same id
- TopiaQuery query = dao.createQuery("e");
- query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, personListToUpdate);
- query.addWhere("e." + PollAccount.PROPERTY_VOTING_ID, TopiaQuery.Op.EQ, pollAccount.getVotingId());
- query.addWhere("e." + PollAccount.TOPIA_ID, TopiaQuery.Op.NEQ, pollAccount.getTopiaId());
- boolean pollAccountExists = dao.existByQuery(query);
- if (pollAccountExists) {
-
- throw new ParticipantAlreadyFoundInListException();
- }
-
- pollAccountToUpdate.setVotingId(pollAccount.getVotingId());
- pollAccountToUpdate.setEmail(pollAccount.getEmail());
-
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public void removePollAccountToFavoriteList(PersonList favoriteList,
- PollAccount pollAccount) throws ParticipantNotFoundException, FavoriteListNotFoundException, ParticipantNotFoundInListException {
-
- Preconditions.checkNotNull(favoriteList);
- Preconditions.checkNotNull(pollAccount);
-
- try {
-
- PersonListDAO personListDAO =
- PollenDAOHelper.getPersonListDAO(getTransaction());
-
- PersonList personListToUpdate =
- personListDAO.findByTopiaId(favoriteList.getTopiaId());
-
- if (personListToUpdate == null) {
- throw new FavoriteListNotFoundException();
- }
-
- PollAccountDAO dao =
- PollenDAOHelper.getPollAccountDAO(getTransaction());
-
- PollAccount pollAccountToRemove =
- dao.findByTopiaId(pollAccount.getTopiaId());
-
- if (pollAccountToRemove == null) {
-
- throw new ParticipantNotFoundException();
- }
-
- PollAccount pollAccountInList =
- personListToUpdate.getPollAccountByTopiaId(pollAccount.getTopiaId());
-
- if (pollAccountInList == null) {
-
- throw new ParticipantNotFoundInListException();
- }
-
- personListToUpdate.removePollAccount(pollAccountToRemove);
-
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
- }
- }
-
- public int getNbUsers() {
- try {
- UserAccountDAO dao = PollenDAOHelper.getUserAccountDAO(getTransaction());
Long result = dao.count();
return result.intValue();
} catch (TopiaException e) {
@@ -576,7 +250,9 @@
}
public void createDefaultUsers() {
+
UserAccount user = getNewUser();
+
user.setAdministrator(true);
String login = getConfiguration().getAdminLogin();
user.setLogin(login);
@@ -621,12 +297,4 @@
destination.setEmail(StringUtils.lowerCase(source.getEmail()));
}
- public PersonList newFavoriteList() {
- PersonListImpl personList = new PersonListImpl();
- return personList;
- }
-
- public PollAccount newPollAccountForFavoriteList() {
- return new PollAccountImpl();
- }
}
1
0
22 Feb '12
Author: tchemit
Date: 2012-02-22 13:06:41 +0100 (Wed, 22 Feb 2012)
New Revision: 3134
Url: http://chorem.org/repositories/revision/pollen/3134
Log:
use nuiton-struts2 in service module to have the pager
Modified:
branches/pollen-1.2.6-struts2/pollen-services/pom.xml
Modified: branches/pollen-1.2.6-struts2/pollen-services/pom.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/pom.xml 2012-02-22 12:06:04 UTC (rev 3133)
+++ branches/pollen-1.2.6-struts2/pollen-services/pom.xml 2012-02-22 12:06:41 UTC (rev 3134)
@@ -62,6 +62,10 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
+ <groupId>org.nuiton.web</groupId>
+ <artifactId>nuiton-struts2</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
</dependency>
1
0
Author: tchemit
Date: 2012-02-22 13:06:04 +0100 (Wed, 22 Feb 2012)
New Revision: 3133
Url: http://chorem.org/repositories/revision/pollen/3133
Log:
clean pom + up some version
Modified:
branches/pollen-1.2.6-struts2/pom.xml
Modified: branches/pollen-1.2.6-struts2/pom.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pom.xml 2012-02-15 14:08:21 UTC (rev 3132)
+++ branches/pollen-1.2.6-struts2/pom.xml 2012-02-22 12:06:04 UTC (rev 3133)
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
- <version>3.6.9.Final</version>
+ <version>3.6.10.Final</version>
</dependency>
<dependency>
@@ -283,128 +283,6 @@
<version>1.0.12</version>
</dependency>
- <!--dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
- <groupId>org.nuiton</groupId>
- <artifactId>nuiton-utils</artifactId>
- <version>${nuiton-utils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.nuiton.topia</groupId>
- <artifactId>topia-persistence</artifactId>
- <version>${topia.version}</version>
- </dependency>
- <dependency>
- <groupId>org.nuiton.topia</groupId>
- <artifactId>topia-service-migration</artifactId>
- <version>${topia.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-core</artifactId>
- <version>${tapestry.version}</version>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.8</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.5.8</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tapestry</groupId>
- <artifactId>tapestry-upload</artifactId>
- <version>${tapestry.version}</version>
- </dependency>
- <dependency>
- <groupId>org.chenillekit</groupId>
- <artifactId>chenillekit-tapestry</artifactId>
- <version>1.0.0</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- <version>1.0.12</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.8.0.GA</version>
- </dependency>
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.0.1</version>
- </dependency>
- <dependency>
- <groupId>rome</groupId>
- <artifactId>rome</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.2.131</version>
- </dependency>
- <dependency>
- <groupId>postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc4</version>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jvnet.hudson.winstone</groupId>
- <artifactId>winstone</artifactId>
- <version>0.9.10-hudson-16</version>
- </dependency-->
</dependencies>
</dependencyManagement>
@@ -555,9 +433,9 @@
<eugenePluginVersion>2.4.2</eugenePluginVersion>
<nuitonI18nVersion>2.4.1</nuitonI18nVersion>
<tapestryVersion>5.1.0.5</tapestryVersion>
- <nuitonWebVersion>1.9.1</nuitonWebVersion>
+ <nuitonWebVersion>1.9.2</nuitonWebVersion>
<nuitonUtilsVersion>2.4.4</nuitonUtilsVersion>
- <h2Version>1.3.163</h2Version>
+ <h2Version>1.3.164</h2Version>
<postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>
<struts2Version>2.3.1.2</struts2Version>
<jqueryPluginVersion>3.2.1</jqueryPluginVersion>
@@ -572,27 +450,6 @@
</properties>
- <!--<properties>-->
-
- <!--<!– redmine configuration –>-->
- <!--<platform>chorem.org</platform>-->
- <!--<projectId>pollen</projectId>-->
-
- <!--<!– customized versions –>-->
- <!--<!–javadoc.version>2.4</javadoc.version–>-->
- <!--<topia.version>2.2.2</topia.version>-->
- <!--<eugene.version>1.0.1</eugene.version>-->
- <!--<tapestry.version>5.1.0.5</tapestry.version>-->
- <!--<nuiton-utils.version>1.1.2</nuiton-utils.version>-->
-
- <!--<!–Multilanguage maven-site –>-->
- <!--<siteLocales>en,fr</siteLocales>-->
-
- <!--<!– license to use –>-->
- <!--<license.licenseName>gpl_v3</license.licenseName>-->
-
- <!--</properties>-->
-
<build>
<pluginManagement>
1
0
Author: tchemit
Date: 2012-02-15 15:08:21 +0100 (Wed, 15 Feb 2012)
New Revision: 3132
Url: http://chorem.org/repositories/revision/pollen/3132
Log:
revert trunk site deploy modifications
Modified:
branches/pollen-1.2.6-struts2/pom.xml
Modified: branches/pollen-1.2.6-struts2/pom.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pom.xml 2012-02-09 23:46:48 UTC (rev 3131)
+++ branches/pollen-1.2.6-struts2/pom.xml 2012-02-15 14:08:21 UTC (rev 3132)
@@ -415,7 +415,7 @@
<name>Pollen</name>
<description>Application de vote Pollen</description>
<inceptionYear>2009</inceptionYear>
- <url>http://maven-site.chorem.org/pollen${projectUrlSuffix}</url>
+ <url>http://maven-site.chorem.org/pollen</url>
<licenses>
<license>
@@ -676,7 +676,7 @@
<distributionManagement>
<site>
<id>${platform}</id>
- <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url>
+ <url>${our.site.repository}/${projectId}</url>
</site>
</distributionManagement>
1
0
Author: tchemit
Date: 2012-02-10 00:46:48 +0100 (Fri, 10 Feb 2012)
New Revision: 3131
Url: http://chorem.org/repositories/revision/pollen/3131
Log:
fix site generation
Modified:
branches/pollen-1.2.6-struts2/src/site/site_fr.xml
Modified: branches/pollen-1.2.6-struts2/src/site/site_fr.xml
===================================================================
--- branches/pollen-1.2.6-struts2/src/site/site_fr.xml 2012-02-09 23:43:15 UTC (rev 3130)
+++ branches/pollen-1.2.6-struts2/src/site/site_fr.xml 2012-02-09 23:46:48 UTC (rev 3131)
@@ -70,7 +70,7 @@
<item name="Développeur" href="developer.html">
<item name="Analyse" href="analyse.html"/>
<item name="Architecture" href="architecture.html"/>
- <item name="Conception">
+ <item name="Conception" href="#">
<item name="Business" href="business.html"/>
<item name="VoteCounting" href="votecounting.html"/>
<item name="UI" href="ui.html"/>
1
0
Author: tchemit
Date: 2012-02-10 00:43:15 +0100 (Fri, 10 Feb 2012)
New Revision: 3130
Url: http://chorem.org/repositories/revision/pollen/3130
Log:
fix dep
Modified:
branches/pollen-1.2.6-struts2/pom.xml
Modified: branches/pollen-1.2.6-struts2/pom.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pom.xml 2012-02-09 23:24:15 UTC (rev 3129)
+++ branches/pollen-1.2.6-struts2/pom.xml 2012-02-09 23:43:15 UTC (rev 3130)
@@ -562,7 +562,8 @@
<struts2Version>2.3.1.2</struts2Version>
<jqueryPluginVersion>3.2.1</jqueryPluginVersion>
<slf4jVersion>1.6.4</slf4jVersion>
-
+ <jettyVersion>${jettyPluginVersion}</jettyVersion>
+
<!--Multilanguage maven-site -->
<siteLocales>en,fr</siteLocales>
1
0
Author: tchemit
Date: 2012-02-10 00:24:15 +0100 (Fri, 10 Feb 2012)
New Revision: 3129
Url: http://chorem.org/repositories/revision/pollen/3129
Log:
updates to mavenpom 3.1.1
Modified:
branches/pollen-1.2.6-struts2/pom.xml
Modified: branches/pollen-1.2.6-struts2/pom.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pom.xml 2012-02-01 13:17:42 UTC (rev 3128)
+++ branches/pollen-1.2.6-struts2/pom.xml 2012-02-09 23:24:15 UTC (rev 3129)
@@ -12,7 +12,7 @@
<parent>
<groupId>org.nuiton</groupId>
<artifactId>mavenpom4redmine</artifactId>
- <version>3.0.7</version>
+ <version>3.1.1-SNAPSHOT</version>
</parent>
<groupId>org.chorem</groupId>
@@ -415,7 +415,7 @@
<name>Pollen</name>
<description>Application de vote Pollen</description>
<inceptionYear>2009</inceptionYear>
- <url>http://maven-site.chorem.org/pollen/</url>
+ <url>http://maven-site.chorem.org/pollen${projectUrlSuffix}</url>
<licenses>
<license>
@@ -563,8 +563,6 @@
<jqueryPluginVersion>3.2.1</jqueryPluginVersion>
<slf4jVersion>1.6.4</slf4jVersion>
- <jettyVersion>8.1.0.RC5</jettyVersion>
-
<!--Multilanguage maven-site -->
<siteLocales>en,fr</siteLocales>
@@ -677,7 +675,7 @@
<distributionManagement>
<site>
<id>${platform}</id>
- <url>${our.site.repository}/${projectId}-1.2.6</url>
+ <url>${our.site.repository}/${projectId}${projectUrlSuffix}</url>
</site>
</distributionManagement>
1
0
r3128 - in branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services: . impl
by tchemitï¼ users.chorem.org 01 Feb '12
by tchemitï¼ users.chorem.org 01 Feb '12
01 Feb '12
Author: tchemit
Date: 2012-02-01 14:17:42 +0100 (Wed, 01 Feb 2012)
New Revision: 3128
Url: http://chorem.org/repositories/revision/pollen/3128
Log:
fix polls queries
Modified:
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-02-01 13:11:41 UTC (rev 3127)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-02-01 13:17:42 UTC (rev 3128)
@@ -27,6 +27,9 @@
import org.nuiton.topia.framework.TopiaQuery;
import org.nuiton.util.PagerUtil;
+import java.util.ArrayList;
+import java.util.List;
+
/**
* Override nuiton pager while adding sort informations.
* <p/>
@@ -61,9 +64,9 @@
this.sortColumn = sortColumn;
}
- public static void addPagerToQuery(PollenPagerBean pager,
- TopiaQuery query) {
-
+ public static TopiaQuery addPagerToQuery(TopiaQuery query,
+ PollenPagerBean pager) {
+ PagerUtil.computeRecordIndexesAndPagesNumber(pager);
query.setLimit(pager.getRecordStartIndex(),
pager.getRecordEndIndex() - 1);
@@ -74,6 +77,18 @@
query.addOrderDesc(pager.getSortColumn());
}
}
+ return query;
}
+ public static <E> List<E> getPageFromList(List<E> elements,
+ PollenPagerBean pager) {
+
+ PagerUtil.computeRecordIndexesAndPagesNumber(pager);
+ List<E> subList = elements.subList(pager.getRecordStartIndex(),
+ pager.getRecordEndIndex());
+ List<E> result = new ArrayList<E>(subList);
+
+ return result;
+ }
+
}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-02-01 13:11:41 UTC (rev 3127)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-02-01 13:17:42 UTC (rev 3128)
@@ -23,22 +23,26 @@
*/
package org.chorem.pollen.services.impl;
+import com.google.common.collect.Lists;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.chorem.pollen.PollenConfiguration;
import org.chorem.pollen.PollenTechnicalException;
+import org.chorem.pollen.business.persistence.PersonToList;
import org.chorem.pollen.business.persistence.Poll;
import org.chorem.pollen.business.persistence.PollAccount;
import org.chorem.pollen.business.persistence.PollAccountImpl;
import org.chorem.pollen.business.persistence.PollDAO;
import org.chorem.pollen.business.persistence.PollImpl;
import org.chorem.pollen.business.persistence.UserAccount;
+import org.chorem.pollen.business.persistence.Vote;
+import org.chorem.pollen.business.persistence.VoteDAO;
+import org.chorem.pollen.business.persistence.VotingList;
import org.chorem.pollen.entities.PollenDAOHelper;
import org.chorem.pollen.services.PollenPagerBean;
import org.chorem.pollen.services.PollenServiceSupport;
import org.nuiton.topia.TopiaException;
import org.nuiton.topia.framework.TopiaQuery;
-import org.nuiton.util.PagerUtil;
import java.util.List;
@@ -86,9 +90,9 @@
long records = dao.count();
pager.setRecords((int) records);
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
+
TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(pager, query);
+ PollenPagerBean.addPagerToQuery(query, pager);
List<Poll> result = dao.findAllByQuery(query);
return result;
@@ -107,10 +111,7 @@
long records = dao.countByQuery(countQuery);
pager.setRecords((int) records);
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(pager, query);
- query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
+ TopiaQuery query = PollenPagerBean.addPagerToQuery(countQuery, pager);
List<Poll> result = dao.findAllByQuery(query);
return result;
@@ -121,49 +122,109 @@
public List<Poll> getInvitedPolls(PollenPagerBean pager, UserAccount user) {
- try {
- PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction());
+ UserService userService = newService(UserService.class);
+ UserAccount userToUse = userService.getEntityById(UserAccount.class, user.getTopiaId());
- TopiaQuery countQuery = dao.createQuery("e");
- countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
- long records = dao.countByQuery(countQuery);
- pager.setRecords((int) records);
+ //FIXME Use a query to do this to avoid in memory pagination
+ String email = userToUse.getEmail();
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(pager, query);
- query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
+ List<Poll> polls = userService.getEntities(Poll.class);
+ List<Poll> allPolls = Lists.newLinkedList();
+ for (Poll poll : polls) {
+ for (VotingList votingList : poll.getVotingList()) {
+ for (PersonToList personToList : votingList
+ .getPollAccountPersonToList()) {
+ if (!personToList.getHasVoted()) {
+ PollAccount pollAccount = personToList
+ .getPollAccount();
- List<Poll> result = dao.findAllByQuery(query);
- return result;
- } catch (TopiaException e) {
- throw new PollenTechnicalException(e);
+ if (pollAccount != null
+ && pollAccount.getEmail() != null
+ && pollAccount.getEmail().equals(
+ email)) {
+ allPolls.add(poll);
+ }
+ }
+ }
+ }
}
+
+ int records = allPolls.size();
+ pager.setRecords(records);
+
+ List<Poll> result = PollenPagerBean.getPageFromList(allPolls, pager);
+ return result;
+
+// try {
+// PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction());
+// TopiaQuery countQuery = dao.createQuery("e");
+// countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
+// long records = dao.countByQuery(countQuery);
+// pager.setRecords((int) records);
+//
+// PagerUtil.computeRecordIndexesAndPagesNumber(pager);
+// TopiaQuery query = dao.createQuery("e");
+// PollenPagerBean.addPagerToQuery(pager, query);
+// query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
+//
+// List<Poll> result = dao.findAllByQuery(query);
+// return result;
+// } catch (TopiaException e) {
+// throw new PollenTechnicalException(e);
+// }
}
- public List<Poll> getParticipatedPolls(PollenPagerBean pager, UserAccount user) {
+ public List<Poll> getParticipatedPolls(PollenPagerBean pager,
+ UserAccount user) {
+ //FIXME Use a query to do this to avoid in memory pagination
+
+ UserService userService = newService(UserService.class);
+ UserAccount userToUse =
+ userService.getEntityById(UserAccount.class, user.getTopiaId());
+
+// List<Poll> allPolls = Lists.newArraPagerUtil.computeRecordIndexesAndPagesNumber(pager);yList();
+// for (PollAccount pollAccount : userToUse.getPollAccount()) {
+// for (Vote vote : pollAccount.getVote()) {
+// Poll poll = vote.getPoll();
+// if (!allPolls.contains(poll)) {
+// allPolls.add(poll);
+// }
+// }
+// }
+// int records = allPolls.size();
+// pager.setRecords(records);
+// PagerUtil.computeRecordIndexesAndPagesNumber(pager);
+// List<Poll> result = PollenPagerBean.getPageFromList(allPolls, pager);
+// return result;
+
+
try {
- PollDAO dao = PollenDAOHelper.getPollDAO(getTransaction());
+ PollDAO pollDao = PollenDAOHelper.getPollDAO(getTransaction());
+ VoteDAO voteDao = PollenDAOHelper.getVoteDAO(getTransaction());
- TopiaQuery countQuery = dao.createQuery("e");
- countQuery.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
- long records = dao.countByQuery(countQuery);
+ TopiaQuery countQuery = voteDao.createQuery("e").
+ addDistinct().
+ setSelect("e." + Vote.PROPERTY_POLL).
+ addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, userToUse);
+
+ long records = pollDao.countByQuery(countQuery);
pager.setRecords((int) records);
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(pager, query);
- query.addWhere("e." + Poll.PROPERTY_CREATOR + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, user);
+ TopiaQuery query = PollenPagerBean.addPagerToQuery(countQuery, pager);
- List<Poll> result = dao.findAllByQuery(query);
+// query.addDistinct();
+// query.setSelect("e." + Vote.PROPERTY_POLL);
+// query.addWhere("e." + Vote.PROPERTY_POLL_ACCOUNT + "." + PollAccount.PROPERTY_USER_ACCOUNT, TopiaQuery.Op.EQ, userToUse);
+
+ List<Poll> result = pollDao.findAllByQuery(query);
return result;
} catch (TopiaException e) {
throw new PollenTechnicalException(e);
}
+
}
-
/*
@Override
public List<PollDTO> findParticipatedPolls(String userId) {
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-02-01 13:11:41 UTC (rev 3127)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-02-01 13:17:42 UTC (rev 3128)
@@ -55,7 +55,6 @@
import org.nuiton.topia.TopiaException;
import org.nuiton.topia.framework.TopiaQuery;
import org.nuiton.topia.persistence.util.TopiaEntityBinder;
-import org.nuiton.util.PagerUtil;
import org.nuiton.util.StringUtil;
import org.nuiton.util.beans.Binder;
@@ -229,9 +228,8 @@
long records = dao.count();
pager.setRecords((int) records);
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
TopiaQuery query = dao.createQuery("e");
- PollenPagerBean.addPagerToQuery(pager, query);
+ PollenPagerBean.addPagerToQuery(query, pager);
List<UserAccount> result = dao.findAllByQuery(query);
return result;
@@ -254,10 +252,7 @@
pager.setRecords((int) records);
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- TopiaQuery query = dao.createQuery("e");
- query.addWhere("e." + PersonList.PROPERTY_OWNER, TopiaQuery.Op.EQ, user);
- PollenPagerBean.addPagerToQuery(pager, query);
+ TopiaQuery query = PollenPagerBean.addPagerToQuery(countQuery, pager);
List<PersonList> result = dao.findAllByQuery(query);
return result;
@@ -316,16 +311,15 @@
int records = favoriteList.sizePollAccount();
pager.setRecords(records);
- PagerUtil.computeRecordIndexesAndPagesNumber(pager);
- PollAccountDAO pollAccountDAO =
+ PollAccountDAO dao =
PollenDAOHelper.getPollAccountDAO(getTransaction());
- TopiaQuery query = pollAccountDAO.createQuery("e");
+ TopiaQuery query = dao.createQuery("e");
+ PollenPagerBean.addPagerToQuery(query, pager);
query.addWhere("e." + PollAccount.PROPERTY_PERSON_LIST, TopiaQuery.Op.EQ, favoriteList);
- PollenPagerBean.addPagerToQuery(pager, query);
- List<PollAccount> result = pollAccountDAO.findAllByQuery(query);
+ List<PollAccount> result = dao.findAllByQuery(query);
return result;
} catch (TopiaException e) {
1
0
Author: tchemit
Date: 2012-02-01 14:11:41 +0100 (Wed, 01 Feb 2012)
New Revision: 3127
Url: http://chorem.org/repositories/revision/pollen/3127
Log:
update versions
Modified:
branches/pollen-1.2.6-struts2/pom.xml
Modified: branches/pollen-1.2.6-struts2/pom.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pom.xml 2012-01-31 21:14:15 UTC (rev 3126)
+++ branches/pollen-1.2.6-struts2/pom.xml 2012-02-01 13:11:41 UTC (rev 3127)
@@ -551,11 +551,12 @@
<projectId>pollen</projectId>
<!-- customized versions -->
- <topiaVersion>2.6.4</topiaVersion>
- <eugenePluginVersion>2.4.1</eugenePluginVersion>
+ <topiaVersion>2.6.7-SNAPSHOT</topiaVersion>
+ <eugenePluginVersion>2.4.2</eugenePluginVersion>
<nuitonI18nVersion>2.4.1</nuitonI18nVersion>
<tapestryVersion>5.1.0.5</tapestryVersion>
- <nuitonWebVersion>1.9.1</nuitonWebVersion> <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion>
+ <nuitonWebVersion>1.9.1</nuitonWebVersion>
+ <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion>
<h2Version>1.3.163</h2Version>
<postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion>
<struts2Version>2.3.1.2</struts2Version>
1
0
Author: tchemit
Date: 2012-01-31 22:14:15 +0100 (Tue, 31 Jan 2012)
New Revision: 3126
Url: http://chorem.org/repositories/revision/pollen/3126
Log:
fix licenses + versions
Removed:
branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh
Modified:
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java
branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties
branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java
branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java
branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties
branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp
branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -40,10 +40,10 @@
import java.util.Properties;
/**
- * EchoBase configuration.
+ * Pollen configuration.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class PollenConfiguration {
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -32,10 +32,10 @@
import java.io.File;
/**
- * All EchoBase configuration options.
+ * All Pollen configuration options.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public enum PollenConfigurationOption implements ApplicationConfig.OptionDef {
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -28,10 +28,10 @@
import org.nuiton.topia.persistence.TopiaEntity;
/**
- * USefull pollen functions.
+ * Usefull pollen functions.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenFunctions {
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTechnicalException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -25,7 +25,7 @@
/**
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class PollenTechnicalException extends RuntimeException {
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/PollenTopiaRootContextFactory.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -41,7 +41,7 @@
/**
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class PollenTopiaRootContextFactory {
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/UserAccountImpl.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallback.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_1.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_2_6.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/main/xmi/pollen.properties 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2009 - 2012 CodeLutin
+# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Deleted: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/largemaillist.sh 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,26 +0,0 @@
-###
-# #%L
-# Pollen :: Business
-#
-# $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%
-###
-#!/bin/sh
-
-for i in `seq 0 3000`; do echo "\"Test $i\",\"toto+pollen+$i(a)domain.com\",1" >> test3000.csv; done
Modified: branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-persistence/src/test/resources/log4j.properties 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2009 - 2012 CodeLutin
+# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/bean/UserPoll.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -35,7 +35,7 @@
* Instances of this class will be given to service factory.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class DefaultPollenServiceContext implements PollenServiceContext {
@@ -63,9 +63,9 @@
PollenConfiguration configuration,
PollenServiceFactory serviceFactory) {
return new DefaultPollenServiceContext(locale,
- transaction,
- configuration,
- serviceFactory);
+ transaction,
+ configuration,
+ serviceFactory);
}
protected DefaultPollenServiceContext(Locale locale,
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenPagerBean.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -30,7 +30,7 @@
*
* @author tchemit <chemit(a)codelutin.com>
* @see PollenServiceContext
- * @since 0.1
+ * @since 1.2.6
*/
public interface PollenService {
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -36,7 +36,7 @@
* {@link PollenServiceFactory#newService(Class, PollenServiceContext)}
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public interface PollenServiceContext {
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFactory.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -31,7 +31,7 @@
* Factory of services.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class PollenServiceFactory {
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceSupport.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -25,7 +25,6 @@
import com.google.common.base.Preconditions;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateUtils;
import org.chorem.pollen.PollenConfiguration;
import org.chorem.pollen.PollenTechnicalException;
import org.chorem.pollen.entities.PollenDAOHelper;
@@ -35,13 +34,12 @@
import org.nuiton.topia.persistence.TopiaDAO;
import org.nuiton.topia.persistence.TopiaEntity;
-import java.util.Date;
import java.util.List;
import java.util.Locale;
/**
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class PollenServiceSupport implements PollenService {
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListAlreadyExistException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* @author tchemit <chemit(a)codelutin.com>
* @since 1.2.6
*/
-public class FavoriteListNotFoundException extends Exception{
+public class FavoriteListNotFoundException extends Exception {
private static final long serialVersionUID = 1L;
}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListNotOwnedByUserException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* @author tchemit <chemit(a)codelutin.com>
* @since 1.2.6
*/
-public class FavoriteListNotOwnedByUserException extends Exception{
+public class FavoriteListNotOwnedByUserException extends Exception {
private static final long serialVersionUID = 1L;
}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantAlreadyFoundInListException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantExistWithoutMailException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* @author tchemit <chemit(a)codelutin.com>
* @since 1.2.6
*/
-public class ParticipantNotFoundException extends Exception{
+public class ParticipantNotFoundException extends Exception {
private static final long serialVersionUID = 1L;
}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/ParticipantNotFoundInListException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* @author tchemit <chemit(a)codelutin.com>
* @since 1.2.6
*/
-public class ParticipantNotFoundInListException extends Exception{
+public class ParticipantNotFoundInListException extends Exception {
private static final long serialVersionUID = 1L;
}
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyClosedException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollAlreadyExistException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/PollNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserEmailAlreadyUsedException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserInvalidPasswordException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserLoginAlreadyUsedException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/UserNotFoundException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteDoubloonException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/VoteNotAllowedException.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/EmailService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollCommentService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/AbstractPollenServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/EmailServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/PollServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/UserServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/java/org/chorem/pollen/services/impl/VoteServiceTest.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/log4j.properties 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2009 - 2012 CodeLutin
+# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-services/src/test/resources/pollen-fake.properties 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2009 - 2012 CodeLutin
+# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationContext.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -30,7 +30,7 @@
/**
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenApplicationContext {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -54,7 +54,7 @@
* On stop, just release the application configuration.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenApplicationListener implements ServletContextListener {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -31,7 +31,7 @@
* User session to put in servlet session.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenSession {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTopiaTransactionFilter.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -35,7 +35,7 @@
* EchoBase implementation of the {@link TopiaTransactionFilter}.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenTopiaTransactionFilter extends TopiaTransactionFilter {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -35,7 +35,7 @@
* Usefull ui methods.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenUIUtils {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -58,7 +58,7 @@
* untranslated key.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class PollenActionSupport extends BaseAction implements TopiaTransactionAware {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManagePolls.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -28,7 +28,7 @@
/**
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class ManagePolls extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/admin/ManageUsers.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -34,7 +34,7 @@
/**
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class ManageUsers extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/AbstractJSONPaginedAction.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -33,7 +33,7 @@
* Abstract JSON action with pagination support.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public abstract class AbstractJSONPaginedAction extends PollenActionSupport {
@@ -49,12 +49,6 @@
protected PollenPagerBean pager = new PollenPagerBean();
-// // sorting order - asc or desc
-// protected String sord;
-//
-// // get index row - i.e. user click to sort.
-// protected String sidx;
-
protected String filters;
public void setRows(Integer rows) {
@@ -65,13 +59,8 @@
pager.setPageIndex(page);
}
-// public String getSord() {
-// return sord;
-// }
-
public void setSord(String sord) {
pager.setSortAscendant("asc".equals(sord));
-// this.sord = sord;
}
public String getSidx() {
@@ -80,7 +69,6 @@
public void setSidx(String sidx) {
pager.setSortColumn(sidx);
-// this.sidx = sidx;
}
public String getFilters() {
@@ -91,26 +79,6 @@
this.filters = filters;
}
-// protected String getSortColumn() {
-// String result = null;
-// if (useSort()) {
-// result = sidx;
-// }
-// return result;
-// }
-
-// protected boolean isSortAscendant() {
-// boolean result = false;
-// if (useSort()) {
-// result = "asc".equals(sord);
-// }
-// return result;
-// }
-
-// protected boolean useSort() {
-// return StringUtils.isNotEmpty(sidx);
-// }
-
protected Object getFilterObject() throws JSONException {
Object filterObject = null;
if (StringUtils.isNotEmpty(filters)) {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetCreatedPolls.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteList.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccount.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteListPollAccounts.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetFavoriteLists.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetInvitedPolls.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetParticipatedPolls.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetPolls.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -37,7 +37,7 @@
* Obtain paginated users.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class GetPolls extends AbstractJSONPaginedAction {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUser.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -32,10 +32,10 @@
import java.util.Map;
/**
- * Get user datas (for json purpose).
+ * Get user datas.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class GetUser extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/json/GetUsers.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -35,7 +35,7 @@
* Obtain paginated users.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class GetUsers extends AbstractJSONPaginedAction {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Clone.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Close.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Create.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -40,7 +40,7 @@
* Creates a new poll.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Create extends PollenActionSupport implements Preparable {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatedList.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* Display list of created polls.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class CreatedList extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Delete.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Edit.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* Display a poll.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Edit extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Export.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ParticipatedList.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* Display list of participated polls.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class ParticipatedList extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Result.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* Display results of a poll.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Result extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/Vote.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Edit.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -33,7 +33,7 @@
* Update a user.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Edit extends PollenActionSupport {
@@ -89,6 +89,7 @@
UserService service = newService(UserService.class);
+ String result = INPUT;
try {
UserAccount updatedUser =
service.updateUser(user, newPassword, false);
@@ -96,20 +97,18 @@
// push back user to session
getPollenSession().setUserAccount(updatedUser);
- return SUCCESS;
+ result = SUCCESS;
} catch (UserEmailAlreadyUsedException e) {
addFieldError("user.email", _("pollen.error.user.email.already.used"));
} catch (UserInvalidPasswordException e) {
addFieldError("user.password", _("pollen.error.user.invalid.password"));
}
- // if error go back to input
-
// reset password
user.setPassword(null);
newPassword = newPassword2 = null;
- return INPUT;
+ return result;
}
}
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Login.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -34,7 +34,7 @@
* Login user to pollen.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Login extends PollenActionSupport {
@@ -66,18 +66,18 @@
UserService service = newService(UserService.class);
+ String result = ERROR;
try {
UserAccount userAccount = service.connect(login, password);
getPollenSession().setUserAccount(userAccount);
addActionMessage(_("pollen.information.your.are.loggued"));
- return SUCCESS;
+ result = SUCCESS;
} catch (UserNotFoundException e) {
addActionError(_("pollen.error.user.bad.login.or.password"));
} catch (UserInvalidPasswordException e) {
addActionError(_("pollen.error.user.bad.login.or.password"));
}
- // if error go back to input
- return ERROR;
+ return result;
}
}
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Logout.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -29,7 +29,7 @@
* Logout from pollen.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Logout extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteList.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/ManageFavoriteLists.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Register.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -33,7 +33,7 @@
* Register a new user.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Register extends PollenActionSupport {
@@ -68,13 +68,14 @@
UserService service = newService(UserService.class);
+ String result = INPUT;
try {
UserAccount createdUser = service.createUser(user, false, getApplicationUrl());
getTransaction().commitTransaction();
getPollenSession().setUserAccount(createdUser);
addActionMessage(_("pollen.information.your.are.loggued"));
- return SUCCESS;
+ result = SUCCESS;
} catch (UserLoginAlreadyUsedException e) {
addFieldError("user.login", _("pollen.error.user.login.already.used"));
} catch (UserEmailAlreadyUsedException e) {
@@ -87,6 +88,6 @@
user.setPassword(null);
password2 = null;
- return INPUT;
+ return result;
}
}
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/user/Show.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -30,7 +30,7 @@
* Show user account.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class Show extends PollenActionSupport {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsAdmin.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -37,7 +37,7 @@
* To check if logged user is admin.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 2.0
+ * @since 1.2.6
*/
public class CheckUserIsAdmin extends AbstractInterceptor {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/interceptors/CheckUserIsLogguedInterceptor.java 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -35,7 +35,7 @@
* To check user is loggued. If not, then redirect to the {@link #loginAction}.
*
* @author tchemit <chemit(a)codelutin.com>
- * @since 0.1
+ * @since 1.2.6
*/
public class CheckUserIsLogguedInterceptor extends AbstractInterceptor {
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-admin.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-json.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-poll.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/config/struts-user.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/log4j.properties 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2009 - 2012 CodeLutin
+# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-create-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/admin/ManageUsers-edit-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Edit-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Login-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-addPollAccount-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteList-editPollAccount-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/ManageFavoriteLists-createFavoriteList-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/org/chorem/pollen/ui/actions/user/Register-validation.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/pollen.properties 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
# $Id$
# $HeadURL$
# %%
-# Copyright (C) 2009 - 2012 CodeLutin
+# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/struts.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/resources/validators.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/pollsList.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/usersList.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/adminRequired.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/home.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/clone.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/close.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/createdList.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/delete.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/edit.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/export.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/participatedList.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/pollListHelper.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/edit.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteList.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/favoriteLists.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -1,10 +1,11 @@
<%--
-#%L
- EchoBase :: UI
+ #%L
+ Pollen :: UI (strust2)
+
$Id$
$HeadURL$
%%
- Copyright (C) 2011 Ifremer, Codelutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
@@ -19,7 +20,7 @@
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%
---%>
+ --%>
<%@page contentType="text/html" pageEncoding="UTF-8" %>
<%@ taglib prefix="s" uri="/struts-tags" %>
<%@ taglib prefix="sjg" uri="/struts-jquery-grid-tags" %>
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/register.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/user/show.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/WEB-INF/web.xml 2012-01-31 21:14:15 UTC (rev 3126)
@@ -6,7 +6,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/common.css 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/main.css 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/css/screen.css 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/index.jsp 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
$Id$
$HeadURL$
%%
- Copyright (C) 2009 - 2012 CodeLutin
+ Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
%%
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as published by
Modified: branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js
===================================================================
--- branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-31 21:01:08 UTC (rev 3125)
+++ branches/pollen-1.2.6-struts2/pollen-ui-struts2/src/main/webapp/js/gridHelper.js 2012-01-31 21:14:15 UTC (rev 3126)
@@ -5,7 +5,7 @@
* $Id$
* $HeadURL$
* %%
- * Copyright (C) 2009 - 2012 CodeLutin
+ * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
1
0