Author: tchemit Date: 2012-01-24 00:05:59 +0100 (Tue, 24 Jan 2012) New Revision: 3111 Url: http://chorem.org/repositories/revision/pollen/3111 Log: - optimize dependencies - begin of remove PollenException Modified: branches/pollen-2.0-beta-1/pollen-persistence/pom.xml branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/PollenContext.java branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/service/legacy/ServiceUser.java branches/pollen-2.0-beta-1/pollen-persistence/src/main/xmi/pollen.properties branches/pollen-2.0-beta-1/pollen-services/pom.xml branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/PollenContextImpl.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/bean/PollenEmail.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmail.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailAbstract.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailImpl.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavorite.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteAbstract.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteImpl.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePoll.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollAbstract.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollImpl.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserAbstract.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserImpl.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVote.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteAbstract.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteImpl.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteService.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/VoteService.java branches/pollen-2.0-beta-1/pollen-services/src/test/java/org/chorem/pollen/service/legacy/ServicePollImplTest.java branches/pollen-2.0-beta-1/pollen-ui-struts2/pom.xml branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties branches/pollen-2.0-beta-1/pom.xml Modified: branches/pollen-2.0-beta-1/pollen-persistence/pom.xml =================================================================== --- branches/pollen-2.0-beta-1/pollen-persistence/pom.xml 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-persistence/pom.xml 2012-01-23 23:05:59 UTC (rev 3111) @@ -35,26 +35,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </dependency> - <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> </dependency> @@ -63,14 +47,6 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> - <groupId>net.sf.opencsv</groupId> - <artifactId>opencsv</artifactId> - </dependency> - <!-- <dependency> - <groupId>org.chorem</groupId> - <artifactId>chorem-commons</artifactId> - </dependency>--> - <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -93,10 +69,6 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> </dependencies> Modified: branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/PollenContext.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/PollenContext.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/PollenContext.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -123,10 +123,8 @@ * @param eee * @param message * @param args - * @throws PollenException */ - void treateError(Exception eee, String message, Object... args) - throws PollenException; + void treateError(Exception eee, String message, Object... args); /** * doCatch : @@ -134,10 +132,9 @@ * @param eee * @param message * @param args - * @throws PollenException */ void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException; + String message, Object... args) ; /** * doFinally : Modified: branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/ChoiceImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -24,7 +24,7 @@ package org.chorem.pollen.entity; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.chorem.pollen.votecounting.business.NumberMethod; /** Modified: branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/entity/UserAccountImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -24,7 +24,7 @@ package org.chorem.pollen.entity; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * UserAccountImpl Modified: branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/service/legacy/ServiceUser.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/service/legacy/ServiceUser.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-persistence/src/main/java/org/chorem/pollen/service/legacy/ServiceUser.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,27 +23,27 @@ */ package org.chorem.pollen.service.legacy; -import java.util.Map; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.UserAccount; import org.nuiton.topia.framework.EntityFilter; +import java.util.Map; + @Deprecated public interface ServiceUser { - UserAccount connect(String login, String password) throws PollenException, PollenBusinessException; + UserAccount connect(String login, String password) throws PollenBusinessException; - UserAccount getNewUser() throws PollenException; + UserAccount getNewUser(); - void createUser(UserAccount user) throws PollenException, PollenBusinessException; + void createUser(UserAccount user) throws PollenBusinessException; - void updateUser(UserAccount user, boolean byAdmin) throws PollenException, PollenBusinessException; + void updateUser(UserAccount user, boolean byAdmin) throws PollenBusinessException; - void deleteUser(String login) throws PollenException; + void deleteUser(String login); - Map<String, UserAccount> getUsers(EntityFilter filter) throws PollenException; + Map<String, UserAccount> getUsers(EntityFilter filter); - int getNbUsers() throws PollenException; + int getNbUsers(); } //ServiceUser Modified: branches/pollen-2.0-beta-1/pollen-persistence/src/main/xmi/pollen.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-persistence/src/main/xmi/pollen.properties 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-persistence/src/main/xmi/pollen.properties 2012-01-23 23:05:59 UTC (rev 3111) @@ -22,7 +22,7 @@ # #L% ### # Pr\u00e9cise l'ent\u00eate de l'ensemble des fichiers g\u00e9n\u00e9r\u00e9s -model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Pollen\n *##%*/ +#model.tagvalue.copyright=/* *##%\n Copyright (C) 2009 Pollen\n *##%*/ # toString are particularly difficult to use because of lazy initialization model.tagvalue.notGenerateToString=true #model.tagvalue.useLegacyDAO=true @@ -31,7 +31,7 @@ model.tagvalue.constantPrefix=PROPERTY_ model.tagvalue.java.lang.String=text -model.tagvalue.exceptionClass=org.chorem.pollen.PollenException +#model.tagvalue.exceptionClass=org.chorem.pollen.PollenTechnicalException org.chorem.pollen.entity.UserAccount.attribute.login.tagvalue.naturalId=true org.chorem.pollen.entity.UserAccount.attribute.email.tagvalue.unique=true Modified: branches/pollen-2.0-beta-1/pollen-services/pom.xml =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/pom.xml 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/pom.xml 2012-01-23 23:05:59 UTC (rev 3111) @@ -42,14 +42,22 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-email</artifactId> </dependency> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> @@ -65,27 +73,15 @@ <groupId>net.sf.opencsv</groupId> <artifactId>opencsv</artifactId> </dependency> - <!-- <dependency> - <groupId>org.chorem</groupId> - <artifactId>chorem-commons</artifactId> - </dependency>--> <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <!--dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency--> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>test</scope> </dependency> - <!--dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - </dependency--> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/PollenContextImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/PollenContextImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/PollenContextImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -297,11 +297,10 @@ * @param eee the exception to manage * @param message the message to add to the new PollenException * @param args for message - * @throws PollenException which contains the exception as the cause */ @Override public void treateError(Exception eee, String message, Object... args) - throws PollenException { + { treateError(null, eee, message, args); } @@ -315,11 +314,10 @@ * @param eee the exception to manage * @param message the message to add to the new PollenException * @param args for message - * @throws PollenException */ @Override public void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException { + String message, Object... args) { if (log.isErrorEnabled()) { log.error(_(message, args), eee); } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/bean/PollenEmail.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/bean/PollenEmail.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/bean/PollenEmail.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.bean; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.mail.EmailException; import org.apache.commons.mail.SimpleEmail; Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmail.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmail.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmail.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -24,7 +24,6 @@ package org.chorem.pollen.service.legacy; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.bean.PollenEmail; import org.chorem.pollen.entity.UserAccount; @@ -33,8 +32,8 @@ PollenEmail createEmail(); - void sendEmail(PollenEmail email) throws PollenException, PollenBusinessException; + void sendEmail(PollenEmail email) throws PollenBusinessException; - PollenEmail getNewEmail(UserAccount toUser) throws PollenException; + PollenEmail getNewEmail(UserAccount toUser); } //ServiceEmail Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailAbstract.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailAbstract.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailAbstract.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,16 +23,16 @@ */ package org.chorem.pollen.service.legacy; -import java.util.ArrayList; -import java.util.List; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.bean.PollenEmail; import org.chorem.pollen.entity.UserAccount; import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import java.util.ArrayList; +import java.util.List; + @Deprecated public abstract class ServiceEmailAbstract implements ServiceEmail { @@ -40,15 +40,15 @@ protected void commitTransaction(TopiaContext transaction) throws TopiaException { transaction.commitTransaction(); -} + } protected abstract void closeTransaction(TopiaContext transaction) throws TopiaException; - protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws PollenException; + protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args); - protected void treateError(Exception eee, String message, Object... args) throws PollenException { - treateError(null, eee, message, args); - } + protected void treateError(Exception eee, String message, Object... args) { + treateError(null, eee, message, args); + } public abstract void executeSendEmail(PollenEmail pollenEmail) throws Exception; @@ -70,29 +70,29 @@ } @Override - public void sendEmail(PollenEmail email) throws PollenException, PollenBusinessException { + public void sendEmail(PollenEmail email) throws PollenBusinessException { List<Object> errorArgs = new ArrayList<Object>(); - + try { - - executeSendEmail(email); - + + executeSendEmail(email); + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceEmail.sendEmail"), errorArgs.toArray()); + treateError(eee, I18n.n_("pollen.error.serviceEmail.sendEmail"), errorArgs.toArray()); } - + } @Override - public PollenEmail getNewEmail(UserAccount toUser) throws PollenException { + public PollenEmail getNewEmail(UserAccount toUser) { try { - - PollenEmail result = executeGetNewEmail(toUser); - return result; + + PollenEmail result = executeGetNewEmail(toUser); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceEmail.getNewEmail")); + treateError(eee, I18n.n_("pollen.error.serviceEmail.getNewEmail")); } return null; } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceEmailImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -67,7 +67,7 @@ @Override protected void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException { + String message, Object... args) { context.treateError(transaction, eee, message, args); } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavorite.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavorite.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavorite.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,38 +23,38 @@ */ package org.chorem.pollen.service.legacy; -import java.util.List; -import java.util.Map; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.FavoriteList; import org.chorem.pollen.entity.FavoriteParticipant; import org.chorem.pollen.entity.UserAccount; import org.nuiton.topia.framework.EntityFilter; +import java.util.List; +import java.util.Map; + @Deprecated public interface ServiceFavorite { - void createFavoriteParticipant(FavoriteParticipant participant) throws PollenException, PollenBusinessException; + void createFavoriteParticipant(FavoriteParticipant participant) throws PollenBusinessException; - void deleteFavoriteParticipant(String id) throws PollenException; + void deleteFavoriteParticipant(String id); - FavoriteParticipant getFavoriteParticipant(String id) throws PollenException; + FavoriteParticipant getFavoriteParticipant(String id); - Map<String, FavoriteParticipant> getFavoriteParticipants(EntityFilter filter) throws PollenException; + Map<String, FavoriteParticipant> getFavoriteParticipants(EntityFilter filter); - List<FavoriteList> getFavoriteLists(UserAccount user) throws PollenException; + List<FavoriteList> getFavoriteLists(UserAccount user); - void deleteFavoriteList(FavoriteList list) throws PollenException; + void deleteFavoriteList(FavoriteList list); - void createFavoriteList(FavoriteList list) throws PollenException, PollenBusinessException; + void createFavoriteList(FavoriteList list) throws PollenBusinessException; - int getNbFavoriteParticipants(EntityFilter filter) throws PollenException; + int getNbFavoriteParticipants(EntityFilter filter); - FavoriteParticipant getNewFavoriteParticipant(FavoriteList list) throws PollenException; + FavoriteParticipant getNewFavoriteParticipant(FavoriteList list); - FavoriteList getNewFavoriteList(UserAccount user) throws PollenException; + FavoriteList getNewFavoriteList(UserAccount user); - void updateFavoriteParticipant(FavoriteParticipant participant) throws PollenException, PollenBusinessException; + void updateFavoriteParticipant(FavoriteParticipant participant) throws PollenBusinessException; } //ServiceFavorite Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteAbstract.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteAbstract.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteAbstract.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,10 +23,7 @@ */ package org.chorem.pollen.service.legacy; -import java.util.List; -import java.util.Map; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.FavoriteList; import org.chorem.pollen.entity.FavoriteParticipant; import org.chorem.pollen.entity.UserAccount; @@ -35,6 +32,9 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.EntityFilter; +import java.util.List; +import java.util.Map; + @Deprecated public abstract class ServiceFavoriteAbstract implements ServiceFavorite { @@ -42,15 +42,15 @@ protected void commitTransaction(TopiaContext transaction) throws TopiaException { transaction.commitTransaction(); -} + } protected abstract void closeTransaction(TopiaContext transaction) throws TopiaException; - protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws PollenException; + protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args); - protected void treateError(Exception eee, String message, Object... args) throws PollenException { - treateError(null, eee, message, args); - } + protected void treateError(Exception eee, String message, Object... args) { + treateError(null, eee, message, args); + } protected abstract void executeCreateFavoriteParticipant(TopiaContext transaction, FavoriteParticipant participant) throws Exception; @@ -75,47 +75,47 @@ protected abstract void executeUpdateFavoriteParticipant(TopiaContext transaction, FavoriteParticipant participant) throws Exception; @Override - public void createFavoriteParticipant(FavoriteParticipant participant) throws PollenException, PollenBusinessException { + public void createFavoriteParticipant(FavoriteParticipant participant) throws PollenBusinessException { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeCreateFavoriteParticipant(transaction, participant); - + } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.createFavoriteParticipant")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.createFavoriteParticipant")); } - + } @Override - public void deleteFavoriteParticipant(String id) throws PollenException { + public void deleteFavoriteParticipant(String id) { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeDeleteFavoriteParticipant(transaction, id); - + } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.deleteFavoriteParticipant")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.deleteFavoriteParticipant")); } - + } @Override - public FavoriteParticipant getFavoriteParticipant(String id) throws PollenException { + public FavoriteParticipant getFavoriteParticipant(String id) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -126,15 +126,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getFavoriteParticipant")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getFavoriteParticipant")); } return null; } @Override - public Map<String, FavoriteParticipant> getFavoriteParticipants(EntityFilter filter) throws PollenException { + public Map<String, FavoriteParticipant> getFavoriteParticipants(EntityFilter filter) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -145,15 +145,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getFavoriteParticipants")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getFavoriteParticipants")); } return null; } @Override - public List<FavoriteList> getFavoriteLists(UserAccount user) throws PollenException { + public List<FavoriteList> getFavoriteLists(UserAccount user) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -164,55 +164,55 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getFavoriteLists")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getFavoriteLists")); } return null; } @Override - public void deleteFavoriteList(FavoriteList list) throws PollenException { + public void deleteFavoriteList(FavoriteList list) { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeDeleteFavoriteList(transaction, list); - + } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.deleteFavoriteList")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.deleteFavoriteList")); } - + } @Override - public void createFavoriteList(FavoriteList list) throws PollenException, PollenBusinessException { + public void createFavoriteList(FavoriteList list) throws PollenBusinessException { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeCreateFavoriteList(transaction, list); - + } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.createFavoriteList")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.createFavoriteList")); } - + } @Override - public int getNbFavoriteParticipants(EntityFilter filter) throws PollenException { + public int getNbFavoriteParticipants(EntityFilter filter) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -223,56 +223,56 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getNbFavoriteParticipants")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.getNbFavoriteParticipants")); } return 0; } @Override - public FavoriteParticipant getNewFavoriteParticipant(FavoriteList list) throws PollenException { + public FavoriteParticipant getNewFavoriteParticipant(FavoriteList list) { try { - - FavoriteParticipant result = executeGetNewFavoriteParticipant(list); - return result; + + FavoriteParticipant result = executeGetNewFavoriteParticipant(list); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceFavorite.getNewFavoriteParticipant")); + treateError(eee, I18n.n_("pollen.error.serviceFavorite.getNewFavoriteParticipant")); } return null; } @Override - public FavoriteList getNewFavoriteList(UserAccount user) throws PollenException { + public FavoriteList getNewFavoriteList(UserAccount user) { try { - - FavoriteList result = executeGetNewFavoriteList(user); - return result; + + FavoriteList result = executeGetNewFavoriteList(user); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceFavorite.getNewFavoriteList")); + treateError(eee, I18n.n_("pollen.error.serviceFavorite.getNewFavoriteList")); } return null; } @Override - public void updateFavoriteParticipant(FavoriteParticipant participant) throws PollenException, PollenBusinessException { + public void updateFavoriteParticipant(FavoriteParticipant participant) throws PollenBusinessException { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeUpdateFavoriteParticipant(transaction, participant); - + } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.updateFavoriteParticipant")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceFavorite.updateFavoriteParticipant")); } - + } } //ServiceFavoriteAbstract Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceFavoriteImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,14 +23,13 @@ */ package org.chorem.pollen.service.legacy; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBusinessException; import org.chorem.pollen.PollenBusinessException.PollenExceptionType; import org.chorem.pollen.PollenContext; import org.chorem.pollen.PollenDAOHelper; -import org.chorem.pollen.PollenException; import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.entity.FavoriteList; import org.chorem.pollen.entity.FavoriteListDAO; @@ -77,7 +76,7 @@ @Override protected void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException { + String message, Object... args) { context.treateError(transaction, eee, message, args); } @@ -95,7 +94,7 @@ @Override public void executeCreateFavoriteList(TopiaContext transaction, - FavoriteList list) throws TopiaException, PollenBusinessException { + FavoriteList list) throws TopiaException, PollenBusinessException { FavoriteListDAO dao = PollenDAOHelper.getFavoriteListDAO(transaction); @@ -115,8 +114,8 @@ } @Override - public void executeDeleteFavoriteList(TopiaContext transaction, - FavoriteList list) throws TopiaException { + public void executeDeleteFavoriteList(TopiaContext transaction, + FavoriteList list) throws TopiaException { FavoriteListDAO dao = PollenDAOHelper.getFavoriteListDAO(transaction); FavoriteList listLoaded = dao.findByTopiaId(list.getId()); @@ -126,7 +125,7 @@ } @Override - public List<FavoriteList> executeGetFavoriteLists( + public List<FavoriteList> executeGetFavoriteLists( TopiaContext transaction, UserAccount user) throws TopiaException { FavoriteListDAO dao = PollenDAOHelper.getFavoriteListDAO(transaction); @@ -180,7 +179,7 @@ } @Override - public FavoriteParticipant executeGetNewFavoriteParticipant( + public FavoriteParticipant executeGetNewFavoriteParticipant( FavoriteList list) { FavoriteParticipant result = new FavoriteParticipantImpl(); result.setFavoriteList(list); @@ -189,8 +188,8 @@ } @Override - public void executeCreateFavoriteParticipant(TopiaContext transaction, - FavoriteParticipant participant) + public void executeCreateFavoriteParticipant(TopiaContext transaction, + FavoriteParticipant participant) throws PollenBusinessException, TopiaException { FavoriteParticipantDAO dao = @@ -201,8 +200,8 @@ // Create newParticipant with naturalId FavoriteParticipant newParticipant = dao.create(participant.getName(), - participant.getEmail(), - participant.getFavoriteList()); + participant.getEmail(), + participant.getFavoriteList()); // Set other field newParticipant.setWeight(participant.getWeight()); @@ -211,8 +210,8 @@ } @Override - public void executeDeleteFavoriteParticipant(TopiaContext transaction, - String id) throws TopiaException { + public void executeDeleteFavoriteParticipant(TopiaContext transaction, + String id) throws TopiaException { FavoriteParticipantDAO dao = PollenDAOHelper.getFavoriteParticipantDAO(transaction); @@ -225,8 +224,8 @@ } @Override - public void executeUpdateFavoriteParticipant(TopiaContext transaction, - FavoriteParticipant participant) + public void executeUpdateFavoriteParticipant(TopiaContext transaction, + FavoriteParticipant participant) throws TopiaException, PollenBusinessException { FavoriteParticipantDAO dao = @@ -248,7 +247,7 @@ } @Override - public FavoriteParticipant executeGetFavoriteParticipant( + public FavoriteParticipant executeGetFavoriteParticipant( TopiaContext transaction, String id) throws TopiaException { FavoriteParticipantDAO dao = @@ -262,7 +261,7 @@ } @Override - public Map<String, FavoriteParticipant> executeGetFavoriteParticipants( + public Map<String, FavoriteParticipant> executeGetFavoriteParticipants( TopiaContext transaction, EntityFilter filter) throws TopiaException { FavoriteParticipantDAO dao = @@ -286,8 +285,8 @@ } @Override - public int executeGetNbFavoriteParticipants(TopiaContext transaction, - EntityFilter filter) throws TopiaException { + public int executeGetNbFavoriteParticipants(TopiaContext transaction, + EntityFilter filter) throws TopiaException { FavoriteParticipantDAO dao = PollenDAOHelper.getFavoriteParticipantDAO(transaction); Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePoll.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePoll.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePoll.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,10 +23,7 @@ */ package org.chorem.pollen.service.legacy; -import java.util.Collection; -import java.util.List; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.bean.UserPoll; import org.chorem.pollen.entity.Choice; import org.chorem.pollen.entity.Comment; @@ -37,63 +34,66 @@ import org.chorem.pollen.entity.UserAccount; import org.nuiton.topia.framework.EntityFilter; +import java.util.Collection; +import java.util.List; + @Deprecated public interface ServicePoll { /** * Build a new Poll instance with given {@code user} as administrator + * * @param user Build a new Poll instance with given {@code user} as administrator * @return Build a new Poll instance with given {@code user} as administrator - * @throws PollenException */ - Poll getNewPoll(UserAccount user) throws PollenException; + Poll getNewPoll(UserAccount user); /** * Build a new Poll instance based on existing {@code poll} (copy) + * * @param poll Build a new Poll instance based on existing {@code poll} (copy) * @return Build a new Poll instance based on existing {@code poll} (copy) - * @throws PollenException */ - Poll getNewPoll(Poll poll) throws PollenException; + Poll getNewPoll(Poll poll); - Poll createPoll(Poll poll, Collection<ParticipantList> lists) throws PollenException, PollenBusinessException; + Poll createPoll(Poll poll, Collection<ParticipantList> lists) throws PollenBusinessException; - Poll updatePoll(Poll poll) throws PollenException; + Poll updatePoll(Poll poll); - void deletePoll(Poll poll) throws PollenException; + void deletePoll(Poll poll); - boolean deleteChoice(Choice choice) throws PollenException; + boolean deleteChoice(Choice choice); - List<UserPoll> getPolls(EntityFilter filter) throws PollenException; + List<UserPoll> getPolls(EntityFilter filter); - List<Comment> getComments(EntityFilter filter) throws PollenException; + List<Comment> getComments(EntityFilter filter); - ParticipantList getNewPollList() throws PollenException; + ParticipantList getNewPollList(); - Participant getNewPollParticipant() throws PollenException; + Participant getNewPollParticipant(); - Poll getPoll(String pollUid, String... properties) throws PollenException, PollenBusinessException; + Poll getPoll(String pollUid, String... properties) throws PollenBusinessException; - boolean canAdminPoll(String accountUid, String pollUid) throws PollenException; + boolean canAdminPoll(String accountUid, String pollUid); - int getNbTotalPolls() throws PollenException; + int getNbTotalPolls(); - int getNbPollsByUser(UserAccount user) throws PollenException; + int getNbPollsByUser(UserAccount user); - List<Poll> getRunningPolls() throws PollenException; + List<Poll> getRunningPolls(); - int getNbComments(Poll poll) throws PollenException; + int getNbComments(Poll poll); - Comment createComment(Poll poll, Comment comment) throws PollenException; + Comment createComment(Poll poll, Comment comment); - boolean deleteComment(Comment comment) throws PollenException; + boolean deleteComment(Comment comment); - Comment getNewComment(PollAccount account) throws PollenException; + Comment getNewComment(PollAccount account); - Choice createChoice(Poll poll, Choice choice) throws PollenException; + Choice createChoice(Poll poll, Choice choice); - Choice getNewChoice(Poll poll) throws PollenException; + Choice getNewChoice(Poll poll); - void setPollClosed(Poll poll, boolean closed) throws PollenException; + void setPollClosed(Poll poll, boolean closed); } //ServicePoll Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollAbstract.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollAbstract.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollAbstract.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,11 +23,7 @@ */ package org.chorem.pollen.service.legacy; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.bean.UserPoll; import org.chorem.pollen.entity.Choice; import org.chorem.pollen.entity.Comment; @@ -41,6 +37,10 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.EntityFilter; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + @Deprecated public abstract class ServicePollAbstract implements ServicePoll { @@ -48,15 +48,15 @@ protected void commitTransaction(TopiaContext transaction) throws TopiaException { transaction.commitTransaction(); -} + } protected abstract void closeTransaction(TopiaContext transaction) throws TopiaException; - protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws PollenException; + protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args); - protected void treateError(Exception eee, String message, Object... args) throws PollenException { - treateError(null, eee, message, args); - } + protected void treateError(Exception eee, String message, Object... args) { + treateError(null, eee, message, args); + } protected abstract Poll executeGetNewPoll(UserAccount user) throws Exception; @@ -103,33 +103,33 @@ protected abstract void executeSetPollClosed(TopiaContext transaction, Poll poll, boolean closed) throws Exception; @Override - public Poll getNewPoll(UserAccount user) throws PollenException { + public Poll getNewPoll(UserAccount user) { try { - - Poll result = executeGetNewPoll(user); - return result; + + Poll result = executeGetNewPoll(user); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPoll")); + treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPoll")); } return null; } @Override - public Poll getNewPoll(Poll poll) throws PollenException { + public Poll getNewPoll(Poll poll) { try { - - Poll result = executeGetNewPoll(poll); - return result; + + Poll result = executeGetNewPoll(poll); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPoll")); + treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPoll")); } return null; } @Override - public Poll createPoll(Poll poll, Collection<ParticipantList> lists) throws PollenException, PollenBusinessException { + public Poll createPoll(Poll poll, Collection<ParticipantList> lists) throws PollenBusinessException { List<Object> errorArgs = new ArrayList<Object>(); - + TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -140,17 +140,17 @@ } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.createPoll"), errorArgs.toArray()); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.createPoll"), errorArgs.toArray()); } return null; } @Override - public Poll updatePoll(Poll poll) throws PollenException { + public Poll updatePoll(Poll poll) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -161,34 +161,34 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.updatePoll")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.updatePoll")); } return null; } @Override - public void deletePoll(Poll poll) throws PollenException { + public void deletePoll(Poll poll) { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeDeletePoll(transaction, poll); - + } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.deletePoll")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.deletePoll")); } - + } @Override - public boolean deleteChoice(Choice choice) throws PollenException { + public boolean deleteChoice(Choice choice) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -199,15 +199,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.deleteChoice")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.deleteChoice")); } return false; } @Override - public List<UserPoll> getPolls(EntityFilter filter) throws PollenException { + public List<UserPoll> getPolls(EntityFilter filter) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -218,15 +218,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getPolls")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getPolls")); } return null; } @Override - public List<Comment> getComments(EntityFilter filter) throws PollenException { + public List<Comment> getComments(EntityFilter filter) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -237,39 +237,39 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getComments")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getComments")); } return null; } @Override - public ParticipantList getNewPollList() throws PollenException { + public ParticipantList getNewPollList() { try { - - ParticipantList result = executeGetNewPollList(); - return result; + + ParticipantList result = executeGetNewPollList(); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPollList")); + treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPollList")); } return null; } @Override - public Participant getNewPollParticipant() throws PollenException { + public Participant getNewPollParticipant() { try { - - Participant result = executeGetNewPollParticipant(); - return result; + + Participant result = executeGetNewPollParticipant(); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPollParticipant")); + treateError(eee, I18n.n_("pollen.error.servicePoll.getNewPollParticipant")); } return null; } @Override - public Poll getPoll(String pollUid, String... properties) throws PollenException, PollenBusinessException { + public Poll getPoll(String pollUid, String... properties) throws PollenBusinessException { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -280,17 +280,17 @@ } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getPoll")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getPoll")); } return null; } @Override - public boolean canAdminPoll(String accountUid, String pollUid) throws PollenException { + public boolean canAdminPoll(String accountUid, String pollUid) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -301,15 +301,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.canAdminPoll")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.canAdminPoll")); } return false; } @Override - public int getNbTotalPolls() throws PollenException { + public int getNbTotalPolls() { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -320,15 +320,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getNbTotalPolls")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getNbTotalPolls")); } return 0; } @Override - public int getNbPollsByUser(UserAccount user) throws PollenException { + public int getNbPollsByUser(UserAccount user) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -339,15 +339,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getNbPollsByUser")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getNbPollsByUser")); } return 0; } @Override - public List<Poll> getRunningPolls() throws PollenException { + public List<Poll> getRunningPolls() { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -358,15 +358,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getRunningPolls")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getRunningPolls")); } return null; } @Override - public int getNbComments(Poll poll) throws PollenException { + public int getNbComments(Poll poll) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -377,15 +377,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getNbComments")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.getNbComments")); } return 0; } @Override - public Comment createComment(Poll poll, Comment comment) throws PollenException { + public Comment createComment(Poll poll, Comment comment) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -396,15 +396,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.createComment")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.createComment")); } return null; } @Override - public boolean deleteComment(Comment comment) throws PollenException { + public boolean deleteComment(Comment comment) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -415,27 +415,27 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.deleteComment")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.deleteComment")); } return false; } @Override - public Comment getNewComment(PollAccount account) throws PollenException { + public Comment getNewComment(PollAccount account) { try { - - Comment result = executeGetNewComment(account); - return result; + + Comment result = executeGetNewComment(account); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.servicePoll.getNewComment")); + treateError(eee, I18n.n_("pollen.error.servicePoll.getNewComment")); } return null; } @Override - public Choice createChoice(Poll poll, Choice choice) throws PollenException { + public Choice createChoice(Poll poll, Choice choice) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -446,42 +446,42 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.createChoice")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.createChoice")); } return null; } @Override - public Choice getNewChoice(Poll poll) throws PollenException { + public Choice getNewChoice(Poll poll) { try { - - Choice result = executeGetNewChoice(poll); - return result; + + Choice result = executeGetNewChoice(poll); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.servicePoll.getNewChoice")); + treateError(eee, I18n.n_("pollen.error.servicePoll.getNewChoice")); } return null; } @Override - public void setPollClosed(Poll poll, boolean closed) throws PollenException { + public void setPollClosed(Poll poll, boolean closed) { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeSetPollClosed(transaction, poll, closed); - + } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.setPollClosed")); + treateError(transaction, eee, I18n.n_("pollen.error.servicePoll.setPollClosed")); } - + } } //ServicePollAbstract Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServicePollImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -30,7 +30,6 @@ import org.chorem.pollen.PollenBusinessException; import org.chorem.pollen.PollenContext; import org.chorem.pollen.PollenDAOHelper; -import org.chorem.pollen.PollenException; import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.bean.UserPoll; import org.chorem.pollen.common.ChoiceType; @@ -70,7 +69,7 @@ * Created: 23 mars 2010 * * @author fdesbois - * $Id$ + * $Id$ */ @Deprecated public class ServicePollImpl extends ServicePollAbstract { @@ -90,7 +89,7 @@ @Override protected void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException { + String message, Object... args) { context.treateError(transaction, eee, message, args); } @@ -100,7 +99,7 @@ } @Override - public Poll executeGetNewPoll(UserAccount user) { + public Poll executeGetNewPoll(UserAccount user) { Poll poll = new PollImpl(); poll.setChoiceType(ChoiceType.TEXT); poll.setVoteCounting(VoteCountingType.NORMAL); @@ -122,15 +121,15 @@ } @Override - public Poll executeGetNewPoll(Poll poll) { + public Poll executeGetNewPoll(Poll poll) { Poll result = new PollImpl(); TopiaEntityBinder<Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); //TODO-fdesbois-2010-07-13 : add test and check if exluding only those properties is realistic binder.copyExcluding(poll, result, - Poll.PROPERTY_UID, - Poll.PROPERTY_CLOSED, - Poll.PROPERTY_RESULT, - Poll.PROPERTY_POLL_ACCOUNT + Poll.PROPERTY_UID, + Poll.PROPERTY_CLOSED, + Poll.PROPERTY_RESULT, + Poll.PROPERTY_POLL_ACCOUNT ); // Copy of participants only for no free poll if (poll.getType().isRestrictedOrGroup()) { @@ -140,8 +139,8 @@ } @Override - public Poll executeCreatePoll(TopiaContext transaction, - List<Object> errorArgs, Poll poll, Collection<ParticipantList> lists) + public Poll executeCreatePoll(TopiaContext transaction, + List<Object> errorArgs, Poll poll, Collection<ParticipantList> lists) throws TopiaException, IllegalArgumentException, PollenBusinessException { @@ -163,7 +162,7 @@ if (!newPoll.getType().isFree()) { // Create accounts depends on pollType and lists argument List<PollAccount> accounts = createPollAccounts(transaction, - newPoll.getType(), lists); + newPoll.getType(), lists); newPoll.setPollAccount(accounts); } @@ -181,8 +180,8 @@ } @Override - public Poll executeUpdatePoll(TopiaContext transaction, - Poll poll) throws TopiaException { + public Poll executeUpdatePoll(TopiaContext transaction, + Poll poll) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); @@ -219,17 +218,17 @@ // Idea, if we can use Embeddable object for Hibernate, Options will be a good use case binder.copy(poll, pollToUpdate, - Poll.PROPERTY_TITLE, - Poll.PROPERTY_DESCRIPTION, - Poll.PROPERTY_BEGIN_DATE, - Poll.PROPERTY_END_DATE, - Poll.PROPERTY_ANONYMOUS_VOTE_ALLOWED, - Poll.PROPERTY_CHOICE_ADD_ALLOWED, - Poll.PROPERTY_BEGIN_CHOICE_DATE, - Poll.PROPERTY_END_CHOICE_DATE, - Poll.PROPERTY_CONTINUOUS_RESULTS, - Poll.PROPERTY_PUBLIC_RESULTS, - Poll.PROPERTY_MAX_CHOICE_NB + Poll.PROPERTY_TITLE, + Poll.PROPERTY_DESCRIPTION, + Poll.PROPERTY_BEGIN_DATE, + Poll.PROPERTY_END_DATE, + Poll.PROPERTY_ANONYMOUS_VOTE_ALLOWED, + Poll.PROPERTY_CHOICE_ADD_ALLOWED, + Poll.PROPERTY_BEGIN_CHOICE_DATE, + Poll.PROPERTY_END_CHOICE_DATE, + Poll.PROPERTY_CONTINUOUS_RESULTS, + Poll.PROPERTY_PUBLIC_RESULTS, + Poll.PROPERTY_MAX_CHOICE_NB ); // if not started @@ -266,14 +265,14 @@ } @Override - public void executeDeletePoll(TopiaContext transaction, Poll poll) + public void executeDeletePoll(TopiaContext transaction, Poll poll) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); dao.delete(poll); - transaction.commitTransaction(); + transaction.commitTransaction(); } @Override @@ -284,7 +283,7 @@ } @Override - public void executeSetPollClosed(TopiaContext transaction, Poll poll, boolean closed) throws TopiaException { + public void executeSetPollClosed(TopiaContext transaction, Poll poll, boolean closed) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); @@ -296,8 +295,8 @@ } @Override - public Choice executeCreateChoice(TopiaContext transaction, - Poll poll, Choice choice) + public Choice executeCreateChoice(TopiaContext transaction, + Poll poll, Choice choice) throws TopiaException { ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(transaction); @@ -321,7 +320,7 @@ } @Override - public boolean executeDeleteChoice(TopiaContext transaction, Choice choice) + public boolean executeDeleteChoice(TopiaContext transaction, Choice choice) throws TopiaException { ChoiceDAO dao = PollenDAOHelper.getChoiceDAO(transaction); @@ -333,7 +332,7 @@ } @Override - public List<Poll> executeGetRunningPolls(TopiaContext transaction) + public List<Poll> executeGetRunningPolls(TopiaContext transaction) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); @@ -344,9 +343,9 @@ Date now = context.getCurrentDate(); query.addWhere(Poll.PROPERTY_BEGIN_DATE, TopiaQuery.Op.LE, now). - addWhere(Poll.PROPERTY_END_DATE, TopiaQuery.Op.GE, now). - addEquals(Poll.PROPERTY_CLOSED, Boolean.FALSE). - addOrderDesc(Poll.TOPIA_CREATE_DATE); + addWhere(Poll.PROPERTY_END_DATE, TopiaQuery.Op.GE, now). + addEquals(Poll.PROPERTY_CLOSED, Boolean.FALSE). + addOrderDesc(Poll.TOPIA_CREATE_DATE); List<Poll> results = dao.findAllByQuery(query); @@ -354,14 +353,14 @@ } @Override - public List<UserPoll> executeGetPolls(TopiaContext transaction, - EntityFilter filter) + public List<UserPoll> executeGetPolls(TopiaContext transaction, + EntityFilter filter) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); PollenQueryHelper.PollAccountProperty participantProperty = - PollenQueryHelper.newPollAccountChildProperty(); + PollenQueryHelper.newPollAccountChildProperty(); // Filter can be apply on userAccount as reference TopiaQuery query = dao.createQueryFindAllByUser(filter); @@ -376,8 +375,8 @@ } @Override - public int executeGetNbPollsByUser(TopiaContext transaction, - UserAccount user) + public int executeGetNbPollsByUser(TopiaContext transaction, + UserAccount user) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); @@ -392,7 +391,7 @@ } @Override - public int executeGetNbTotalPolls(TopiaContext transaction) + public int executeGetNbTotalPolls(TopiaContext transaction) throws TopiaException { Long result = PollenDAOHelper.getPollDAO(transaction).count(); @@ -401,8 +400,8 @@ } @Override - public List<Comment> executeGetComments(TopiaContext transaction, - EntityFilter filter) + public List<Comment> executeGetComments(TopiaContext transaction, + EntityFilter filter) throws TopiaException { CommentDAO dao = PollenDAOHelper.getCommentDAO(transaction); @@ -431,8 +430,8 @@ } @Override - public int executeGetNbComments(TopiaContext transaction, - Poll poll) + public int executeGetNbComments(TopiaContext transaction, + Poll poll) throws TopiaException { PollDAO dao = PollenDAOHelper.getPollDAO(transaction); @@ -445,8 +444,8 @@ } @Override - public Comment executeCreateComment(TopiaContext transaction, - Poll poll, Comment comment) + public Comment executeCreateComment(TopiaContext transaction, + Poll poll, Comment comment) throws TopiaException { CommentDAO dao = PollenDAOHelper.getCommentDAO(transaction); @@ -471,8 +470,8 @@ } @Override - public boolean executeDeleteComment(TopiaContext transaction, - Comment comment) + public boolean executeDeleteComment(TopiaContext transaction, + Comment comment) throws TopiaException { CommentDAO dao = PollenDAOHelper.getCommentDAO(transaction); @@ -485,7 +484,7 @@ } @Override - public Comment executeGetNewComment(PollAccount account) { + public Comment executeGetNewComment(PollAccount account) { Comment newComment = new CommentImpl(); if (account != null) { newComment.setAuthor(account.getName()); @@ -494,7 +493,7 @@ } @Override - public ParticipantList executeGetNewPollList() { + public ParticipantList executeGetNewPollList() { PollAccount list = new PollAccountImpl(); list.setList(true); list.setChild(new ArrayList<PollAccount>()); @@ -502,15 +501,15 @@ } @Override - public Participant executeGetNewPollParticipant() { + public Participant executeGetNewPollParticipant() { PollAccount participant = new PollAccountImpl(); participant.setWeight(1.); return participant; } @Override - public boolean executeCanAdminPoll(TopiaContext transaction, - String accountUid, String pollUid) + public boolean executeCanAdminPoll(TopiaContext transaction, + String accountUid, String pollUid) throws TopiaException { // String creatorUidProperty = @@ -537,8 +536,8 @@ } @Override - public Poll executeGetPoll(TopiaContext transaction, - String pollUid, String... properties) + public Poll executeGetPoll(TopiaContext transaction, + String pollUid, String... properties) throws TopiaException, PollenBusinessException { // Property is used to control the alias and dependencies inside the query @@ -579,20 +578,20 @@ // Closed (not used in this case) and Creator (managed separately) PollenBinderHelper.getSimpleTopiaBinder(Poll.class). copyExcluding(source, newPoll, - Poll.PROPERTY_UID, - Poll.PROPERTY_CLOSED, - Poll.PROPERTY_CREATOR); + Poll.PROPERTY_UID, + Poll.PROPERTY_CLOSED, + Poll.PROPERTY_CREATOR); // Create creator and set him to the poll PollAccount creator = accountDAO.create(context.createPollenUrlId()); PollenBinderHelper.getSimpleTopiaBinder(PollAccount.class). copy(source.getCreator(), creator, - PollAccount.PROPERTY_NAME, - PollAccount.PROPERTY_EMAIL, + PollAccount.PROPERTY_NAME, + PollAccount.PROPERTY_EMAIL, // PollAccount.WEIGHT, - PollAccount.PROPERTY_ADMIN, - PollAccount.PROPERTY_USER_ACCOUNT); + PollAccount.PROPERTY_ADMIN, + PollAccount.PROPERTY_USER_ACCOUNT); accountDAO.update(creator); newPoll.setCreator(creator); @@ -613,16 +612,16 @@ case RESTRICTED: if (CollectionUtils.isEmpty(lists)) { throw new IllegalArgumentException("lists can't be empty" + - " for restricted poll"); + " for restricted poll"); } // Create accounts only on first participant list results = createPersonAccounts(accountDAO, - lists.iterator().next()); + lists.iterator().next()); break; case GROUP: if (CollectionUtils.isEmpty(lists)) { throw new IllegalArgumentException("lists can't be empty" + - " for group poll"); + " for group poll"); } for (ParticipantList list : lists) { @@ -679,8 +678,8 @@ return results; } - protected List<UserPoll> retrieveUserPolls(TopiaContext transaction, - TopiaQuery query) + protected List<UserPoll> retrieveUserPolls(TopiaContext transaction, + TopiaQuery query) throws TopiaException { List<UserPoll> results = new ArrayList<UserPoll>(); @@ -695,10 +694,10 @@ PollAccount account = (PollAccount) row[1]; if (log.isDebugEnabled()) { log.debug("account : " + account.getUid() + " : " + - account.getName() + - " list(" + account.isList() + ")" + - " admin(" + account.isAdmin() + ")" + - " for poll " + poll.getTitle()); + account.getName() + + " list(" + account.isList() + ")" + + " admin(" + account.isAdmin() + ")" + + " for poll " + poll.getTitle()); } UserPoll userPoll = pollsCache.get(poll.getTopiaId()); Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserAbstract.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserAbstract.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserAbstract.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,17 +23,17 @@ */ package org.chorem.pollen.service.legacy; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.UserAccount; import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.EntityFilter; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + @Deprecated public abstract class ServiceUserAbstract implements ServiceUser { @@ -41,15 +41,15 @@ protected void commitTransaction(TopiaContext transaction) throws TopiaException { transaction.commitTransaction(); -} + } protected abstract void closeTransaction(TopiaContext transaction) throws TopiaException; - protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws PollenException; + protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args); - protected void treateError(Exception eee, String message, Object... args) throws PollenException { - treateError(null, eee, message, args); - } + protected void treateError(Exception eee, String message, Object... args) { + treateError(null, eee, message, args); + } protected abstract UserAccount executeConnect(TopiaContext transaction, List<Object> errorArgs, String login, String password) throws Exception; @@ -66,9 +66,9 @@ protected abstract int executeGetNbUsers(TopiaContext transaction) throws Exception; @Override - public UserAccount connect(String login, String password) throws PollenException, PollenBusinessException { + public UserAccount connect(String login, String password) throws PollenBusinessException { List<Object> errorArgs = new ArrayList<Object>(); - + TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -79,94 +79,94 @@ } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.connect"), errorArgs.toArray()); + treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.connect"), errorArgs.toArray()); } return null; } @Override - public UserAccount getNewUser() throws PollenException { + public UserAccount getNewUser() { try { - - UserAccount result = executeGetNewUser(); - return result; + + UserAccount result = executeGetNewUser(); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceUser.getNewUser")); + treateError(eee, I18n.n_("pollen.error.serviceUser.getNewUser")); } return null; } @Override - public void createUser(UserAccount user) throws PollenException, PollenBusinessException { + public void createUser(UserAccount user) throws PollenBusinessException { List<Object> errorArgs = new ArrayList<Object>(); - + TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeCreateUser(transaction, errorArgs, user); - + } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.createUser"), errorArgs.toArray()); + treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.createUser"), errorArgs.toArray()); } - + } @Override - public void updateUser(UserAccount user, boolean byAdmin) throws PollenException, PollenBusinessException { + public void updateUser(UserAccount user, boolean byAdmin) throws PollenBusinessException { List<Object> errorArgs = new ArrayList<Object>(); - + TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeUpdateUser(transaction, errorArgs, user, byAdmin); - + } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.updateUser"), errorArgs.toArray()); + treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.updateUser"), errorArgs.toArray()); } - + } @Override - public void deleteUser(String login) throws PollenException { + public void deleteUser(String login) { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeDeleteUser(transaction, login); - + } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.deleteUser")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.deleteUser")); } - + } @Override - public Map<String, UserAccount> getUsers(EntityFilter filter) throws PollenException { + public Map<String, UserAccount> getUsers(EntityFilter filter) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -177,15 +177,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.getUsers")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.getUsers")); } return null; } @Override - public int getNbUsers() throws PollenException { + public int getNbUsers() { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -196,9 +196,9 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.getNbUsers")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceUser.getNbUsers")); } return 0; } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceUserImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -24,7 +24,7 @@ package org.chorem.pollen.service.legacy; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBinderHelper; @@ -32,7 +32,6 @@ import org.chorem.pollen.PollenBusinessException.PollenExceptionType; import org.chorem.pollen.PollenContext; import org.chorem.pollen.PollenDAOHelper; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.UserAccount; import org.chorem.pollen.entity.UserAccountDAO; import org.chorem.pollen.entity.UserAccountImpl; @@ -76,7 +75,7 @@ @Override protected void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException { + String message, Object... args) { context.treateError(transaction, eee, message, args); } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVote.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVote.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVote.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,9 +23,7 @@ */ package org.chorem.pollen.service.legacy; -import java.util.List; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.Choice; import org.chorem.pollen.entity.Poll; import org.chorem.pollen.entity.PollAccount; @@ -33,25 +31,27 @@ import org.chorem.pollen.entity.Vote; import org.nuiton.topia.framework.EntityFilter; +import java.util.List; + @Deprecated public interface ServiceVote { - boolean canVote(Poll poll, PollAccount participant) throws PollenException; + boolean canVote(Poll poll, PollAccount participant); - PollAccount getNewPollAccount(UserAccount user) throws PollenException; + PollAccount getNewPollAccount(UserAccount user); - PollAccount getPollAccount(String accountUid) throws PollenException; + PollAccount getPollAccount(String accountUid); - List<PollAccount> getVotes(EntityFilter filter) throws PollenException; + List<PollAccount> getVotes(EntityFilter filter); - void deleteVote(Poll poll, PollAccount participant) throws PollenException; + void deleteVote(Poll poll, PollAccount participant); - int getNbVotes(Poll poll) throws PollenException; + int getNbVotes(Poll poll); - Vote getNewVote(Choice choice) throws PollenException; + Vote getNewVote(Choice choice); - PollAccount saveVote(Poll poll, PollAccount participant) throws PollenException, PollenBusinessException; + PollAccount saveVote(Poll poll, PollAccount participant) throws PollenBusinessException; - PollAccount findPollAccount(Poll poll, UserAccount user) throws PollenException; + PollAccount findPollAccount(Poll poll, UserAccount user); } //ServiceVote Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteAbstract.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteAbstract.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteAbstract.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,9 +23,7 @@ */ package org.chorem.pollen.service.legacy; -import java.util.List; import org.chorem.pollen.PollenBusinessException; -import org.chorem.pollen.PollenException; import org.chorem.pollen.entity.Choice; import org.chorem.pollen.entity.Poll; import org.chorem.pollen.entity.PollAccount; @@ -36,6 +34,8 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.EntityFilter; +import java.util.List; + @Deprecated public abstract class ServiceVoteAbstract implements ServiceVote { @@ -43,15 +43,15 @@ protected void commitTransaction(TopiaContext transaction) throws TopiaException { transaction.commitTransaction(); -} + } protected abstract void closeTransaction(TopiaContext transaction) throws TopiaException; - protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args) throws PollenException; + protected abstract void treateError(TopiaContext transaction, Exception eee, String message, Object... args); - protected void treateError(Exception eee, String message, Object... args) throws PollenException { - treateError(null, eee, message, args); - } + protected void treateError(Exception eee, String message, Object... args) { + treateError(null, eee, message, args); + } protected abstract boolean executeCanVote(TopiaContext transaction, Poll poll, PollAccount participant) throws Exception; @@ -72,7 +72,7 @@ protected abstract PollAccount executeFindPollAccount(TopiaContext transaction, Poll poll, UserAccount user) throws Exception; @Override - public boolean canVote(Poll poll, PollAccount participant) throws PollenException { + public boolean canVote(Poll poll, PollAccount participant) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -83,27 +83,27 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.canVote")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.canVote")); } return false; } @Override - public PollAccount getNewPollAccount(UserAccount user) throws PollenException { + public PollAccount getNewPollAccount(UserAccount user) { try { - - PollAccount result = executeGetNewPollAccount(user); - return result; + + PollAccount result = executeGetNewPollAccount(user); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceVote.getNewPollAccount")); + treateError(eee, I18n.n_("pollen.error.serviceVote.getNewPollAccount")); } return null; } @Override - public PollAccount getPollAccount(String accountUid) throws PollenException { + public PollAccount getPollAccount(String accountUid) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -114,15 +114,15 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.getPollAccount")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.getPollAccount")); } return null; } @Override - public List<PollAccount> getVotes(EntityFilter filter) throws PollenException { + public List<PollAccount> getVotes(EntityFilter filter) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -133,34 +133,34 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.getVotes")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.getVotes")); } return null; } @Override - public void deleteVote(Poll poll, PollAccount participant) throws PollenException { + public void deleteVote(Poll poll, PollAccount participant) { TopiaContext transaction = null; try { transaction = beginTransaction(); try { executeDeleteVote(transaction, poll, participant); - + } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.deleteVote")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.deleteVote")); } - + } @Override - public int getNbVotes(Poll poll) throws PollenException { + public int getNbVotes(Poll poll) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -171,27 +171,27 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.getNbVotes")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.getNbVotes")); } return 0; } @Override - public Vote getNewVote(Choice choice) throws PollenException { + public Vote getNewVote(Choice choice) { try { - - Vote result = executeGetNewVote(choice); - return result; + + Vote result = executeGetNewVote(choice); + return result; } catch (Exception eee) { - treateError(eee, I18n.n_("pollen.error.serviceVote.getNewVote")); + treateError(eee, I18n.n_("pollen.error.serviceVote.getNewVote")); } return null; } @Override - public PollAccount saveVote(Poll poll, PollAccount participant) throws PollenException, PollenBusinessException { + public PollAccount saveVote(Poll poll, PollAccount participant) throws PollenBusinessException { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -202,17 +202,17 @@ } finally { closeTransaction(transaction); } - + } catch (PollenBusinessException eee) { - throw eee; + throw eee; } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.saveVote")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.saveVote")); } return null; } @Override - public PollAccount findPollAccount(Poll poll, UserAccount user) throws PollenException { + public PollAccount findPollAccount(Poll poll, UserAccount user) { TopiaContext transaction = null; try { transaction = beginTransaction(); @@ -223,9 +223,9 @@ } finally { closeTransaction(transaction); } - + } catch (Exception eee) { - treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.findPollAccount")); + treateError(transaction, eee, I18n.n_("pollen.error.serviceVote.findPollAccount")); } return null; } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteImpl.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteImpl.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/service/legacy/ServiceVoteImpl.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,14 +23,13 @@ */ package org.chorem.pollen.service.legacy; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBinderHelper; import org.chorem.pollen.PollenBusinessException; import org.chorem.pollen.PollenContext; import org.chorem.pollen.PollenDAOHelper; -import org.chorem.pollen.PollenException; import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.entity.Choice; import org.chorem.pollen.entity.Poll; @@ -74,7 +73,7 @@ @Override protected void treateError(TopiaContext transaction, Exception eee, - String message, Object... args) throws PollenException { + String message, Object... args) { context.treateError(transaction, eee, message, args); } @@ -100,7 +99,7 @@ if (source.isAnonymous()) { if (log.isInfoEnabled()) { log.info("Anonymous vote, doesn't copy participant's data : " + - "name, email, userAccount"); + "name, email, userAccount"); } excludes = new String[]{ @@ -117,9 +116,9 @@ } @Override - public boolean executeCanVote(TopiaContext transaction, - Poll poll, - PollAccount participant) + public boolean executeCanVote(TopiaContext transaction, + Poll poll, + PollAccount participant) throws TopiaException { if (log.isDebugEnabled()) { @@ -152,7 +151,7 @@ Poll.PROPERTY_CREATOR); query.addEquals(participantAlias, participant). - addWhere(pollCreatorProperty, TopiaQuery.Op.NEQ, participant); + addWhere(pollCreatorProperty, TopiaQuery.Op.NEQ, participant); if (log.isDebugEnabled()) { log.debug("Query : " + query); @@ -164,7 +163,7 @@ } @Override - public PollAccount executeGetNewPollAccount(UserAccount user) { + public PollAccount executeGetNewPollAccount(UserAccount user) { PollAccount account = new PollAccountImpl(); if (user != null) { account.setName(user.getDisplayName()); @@ -175,8 +174,8 @@ } @Override - public PollAccount executeGetPollAccount(TopiaContext transaction, - String accountUid) + public PollAccount executeGetPollAccount(TopiaContext transaction, + String accountUid) throws TopiaException { PollenQueryHelper.PollAccountProperty accountProperty = @@ -185,7 +184,7 @@ TopiaQuery query = PollenQueryHelper.createQuery(accountProperty). addEquals(accountProperty.uid(), accountUid). // Need fetching account votes to edit them - addFetch(accountProperty.choiceVote()); + addFetch(accountProperty.choiceVote()); PollAccount result = PollenDAOHelper.getPollAccountDAO(transaction). findByQuery(query); @@ -194,8 +193,8 @@ } @Override - public List<PollAccount> executeGetVotes(TopiaContext transaction, - EntityFilter filter) + public List<PollAccount> executeGetVotes(TopiaContext transaction, + EntityFilter filter) throws TopiaException { PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(transaction); @@ -213,8 +212,8 @@ PollenQueryHelper.newPollAccountProperty(); TopiaQuery query = dao.createQueryFindAllByPoll(filter). - addDistinct(). - addFetch(accountProperty.choiceVoteProperty().choice()); + addDistinct(). + addFetch(accountProperty.choiceVoteProperty().choice()); List<PollAccount> results = dao.findAllByQuery(query); @@ -226,7 +225,7 @@ } @Override - public int executeGetNbVotes(TopiaContext transaction, Poll poll) + public int executeGetNbVotes(TopiaContext transaction, Poll poll) throws TopiaException { PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(transaction); @@ -240,8 +239,8 @@ } @Override - public void executeDeleteVote(TopiaContext transaction, Poll poll, - PollAccount participant) throws TopiaException { + public void executeDeleteVote(TopiaContext transaction, Poll poll, + PollAccount participant) throws TopiaException { // For free poll, delete the participant // For other types, delete all votes and set voteDate to null @@ -275,15 +274,15 @@ } @Override - public Vote executeGetNewVote(Choice choice) { + public Vote executeGetNewVote(Choice choice) { Vote result = new VoteImpl(); result.setChoice(choice); return result; } @Override - public PollAccount executeSaveVote(TopiaContext transaction, Poll poll, - PollAccount participant) + public PollAccount executeSaveVote(TopiaContext transaction, Poll poll, + PollAccount participant) throws TopiaException, PollenBusinessException { // 1- executeCanVote(transaction, poll, participant); @@ -326,7 +325,7 @@ if (log.isDebugEnabled()) { log.debug("Vote " + participantToSave.getName() + - " updated : " + participantToSave.getVoteDate()); + " updated : " + participantToSave.getVoteDate()); } // Save votes @@ -349,7 +348,7 @@ } @Override - public PollAccount executeFindPollAccount(TopiaContext transaction, Poll poll, UserAccount user) throws Exception { + public PollAccount executeFindPollAccount(TopiaContext transaction, Poll poll, UserAccount user) throws Exception { throw new UnsupportedOperationException("unsupported operation findPollAccount"); } Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteService.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteService.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.services; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenDAOHelper; Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/PollService.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -29,7 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBinderHelper; import org.chorem.pollen.PollenDAOHelper; -import org.chorem.pollen.PollenException; import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.bean.UserPoll; @@ -72,15 +71,19 @@ /** Logger. */ private static final Log log = LogFactory.getLog(PollService.class); + public Poll getNewPoll() { + Poll result = new PollImpl(); + return result; + } + /** * Build a new Poll instance with given {@code user} as administrator * * @param user Build a new Poll instance with given {@code user} as administrator * @return Build a new Poll instance with given {@code user} as administrator - * @throws PollenException */ public Poll getNewPoll(UserAccount user) { - Poll result = new PollImpl(); + Poll result = getNewPoll(); result.setChoiceType(ChoiceType.TEXT); result.setVoteCounting(VoteCountingType.NORMAL); result.setType(PollType.FREE); @@ -105,10 +108,9 @@ * * @param poll Build a new Poll instance based on existing {@code poll} (copy) * @return Build a new Poll instance based on existing {@code poll} (copy) - * @throws PollenException */ public Poll getNewPoll(Poll poll) { - Poll result = new PollImpl(); + Poll result = getNewPoll(); TopiaEntityBinder<Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); //TODO-fdesbois-2010-07-13 : add test and check if exluding only those properties is realistic binder.copyExcluding(poll, result, @@ -190,7 +192,8 @@ throw new PollAlreadyClosedException(); } - TopiaEntityBinder<Poll> binder = PollenBinderHelper.getSimpleTopiaBinder(Poll.class); + TopiaEntityBinder<Poll> binder = + PollenBinderHelper.getSimpleTopiaBinder(Poll.class); // Idea, if we can use Embeddable object for Hibernate, Options will be a good use case binder.copy(poll, pollToUpdate, Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/UserService.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.services; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/VoteService.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/VoteService.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/main/java/org/chorem/pollen/services/VoteService.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,12 +23,11 @@ */ package org.chorem.pollen.services; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBinderHelper; import org.chorem.pollen.PollenDAOHelper; -import org.chorem.pollen.PollenException; import org.chorem.pollen.PollenQueryHelper; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.entity.Choice; @@ -198,7 +197,7 @@ } } - public int getNbVotes(Poll poll) throws PollenException { + public int getNbVotes(Poll poll) { try { PollAccountDAO dao = PollenDAOHelper.getPollAccountDAO(getTransaction()); Modified: branches/pollen-2.0-beta-1/pollen-services/src/test/java/org/chorem/pollen/service/legacy/ServicePollImplTest.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-services/src/test/java/org/chorem/pollen/service/legacy/ServicePollImplTest.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-services/src/test/java/org/chorem/pollen/service/legacy/ServicePollImplTest.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -23,7 +23,7 @@ */ package org.chorem.pollen.service.legacy; -import org.apache.commons.lang.time.DateUtils; +import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenBusinessException; Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/pom.xml =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/pom.xml 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/pom.xml 2012-01-23 23:05:59 UTC (rev 3111) @@ -19,11 +19,11 @@ <artifactId>pollen-ui-struts2</artifactId> <dependencies> - <dependency> + <!--dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-domain</artifactId> <version>${project.version}</version> - </dependency> + </dependency--> <dependency> <groupId>${project.groupId}</groupId> <artifactId>pollen-persistence</artifactId> @@ -38,14 +38,30 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/CreatePoll.java 2012-01-23 23:05:59 UTC (rev 3111) @@ -24,7 +24,6 @@ package org.chorem.pollen.ui.actions.poll; import org.chorem.pollen.entity.Poll; -import org.chorem.pollen.entity.PollImpl; import org.chorem.pollen.services.PollService; import org.chorem.pollen.ui.actions.PollenActionSupport; import org.nuiton.topia.TopiaException; @@ -47,7 +46,7 @@ public Poll getPoll() { if (poll == null) { - poll = new PollImpl(); + poll = newService(PollService.class).getNewPoll(); } return poll; } Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-01-23 23:05:59 UTC (rev 3111) @@ -32,9 +32,9 @@ pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Login pollen.fieldset.userInformation=Informations de l'utilisateur -pollen.fieldset.userInformation.toUpdate=User informations to update pollen.fieldset.userInformation.toCreate=User informations to create pollen.fieldset.userInformation.toDelete=User informations to delete +pollen.fieldset.userInformation.toUpdate=User informations to update pollen.information.need.login=You must be logged to access this page. Please fill the form below. pollen.information.user.created=User %s created. pollen.information.user.deleted=User %s deleted. Modified: branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-01-23 23:05:59 UTC (rev 3111) @@ -32,9 +32,9 @@ pollen.fieldset.connexionInformation=Information de connexion pollen.fieldset.login=Connexion pollen.fieldset.userInformation=Informations de l'utilisateur -pollen.fieldset.userInformation.toUpdate=Informations de l'utilisateur à mettre à jour pollen.fieldset.userInformation.toCreate=Informations de l'utilisateur à créer pollen.fieldset.userInformation.toDelete=Informations de l'utilisateur à supprimer +pollen.fieldset.userInformation.toUpdate=Informations de l'utilisateur à mettre à jour pollen.information.need.login=Vous devez être identifié pour pouvoir accéder à cette page. Veuillez remplir le formulaire ci-dessous. pollen.information.user.created=L'utilisateur %s a été créé. pollen.information.user.deleted=L'utilisateur %s a été supprimé. Modified: branches/pollen-2.0-beta-1/pom.xml =================================================================== --- branches/pollen-2.0-beta-1/pom.xml 2012-01-23 22:31:35 UTC (rev 3110) +++ branches/pollen-2.0-beta-1/pom.xml 2012-01-23 23:05:59 UTC (rev 3111) @@ -32,6 +32,12 @@ <dependencies> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.6.9.Final</version> + </dependency> + + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>11.0.1</version>