[Pollen-commits] r2876 - in trunk: pollen-business pollen-business/src/main/java/org/chorem/pollen/business pollen-business/src/main/java/org/chorem/pollen/business/converters pollen-business/src/main/java/org/chorem/pollen/business/dto pollen-business/src/main/java/org/chorem/pollen/business/services pollen-business/src/main/java/org/chorem/pollen/business/utils pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence pollen-business/src/main/resources/oldmappings/poll

Author: fdesbois Date: 2010-02-22 22:16:44 +0100 (Mon, 22 Feb 2010) New Revision: 2876 Added: trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenBusinessException.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/ConverterHelper.java Modified: trunk/pollen-business/pom.xml trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml trunk/pollen-business/src/main/xmi/pollen.zargo trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java Log: - Refactor createPoll method (no ui test done yet) - use Binder api for convertions (change primitive type by object type in DTO + add getter for boolean properties) - deprecate unused methods (only for tests or old methods or ??) Modified: trunk/pollen-business/pom.xml =================================================================== --- trunk/pollen-business/pom.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/pom.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -27,6 +27,22 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-email</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> +<!-- <dependency> + <groupId>org.chorem</groupId> + <artifactId>chorem-commons</artifactId> + </dependency>--> + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> @@ -35,14 +51,6 @@ <artifactId>topia-service-migration</artifactId> </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-email</artifactId> - </dependency> - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> @@ -70,7 +78,7 @@ <name>Pollen :: Business</name> <description>Partie métier de Pollen</description> - + <!-- ************************************************************* --> <!-- *** Build Settings ****************************************** --> <!-- ************************************************************* --> @@ -80,7 +88,7 @@ <build> <plugins> - + <!-- Plug in Topia --> <plugin> <groupId>org.nuiton.eugene</groupId> @@ -151,3 +159,4 @@ </build> </project> + Added: trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenBusinessException.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenBusinessException.java (rev 0) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenBusinessException.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -0,0 +1,23 @@ + +package org.chorem.pollen.business; + +/** + * PollenBusinessException + * + * Created: 22 févr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class PollenBusinessException extends Exception { + + private static final long serialVersionUID = 1L; + + public PollenBusinessException(String message) { + super(message); + } + +} Property changes on: trunk/pollen-business/src/main/java/org/chorem/pollen/business/PollenBusinessException.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Added: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/ConverterHelper.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/ConverterHelper.java (rev 0) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/ConverterHelper.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -0,0 +1,167 @@ + +package org.chorem.pollen.business.converters; + +import org.chorem.pollen.business.dto.ChoiceDTO; +import org.chorem.pollen.business.dto.PollAccountDTO; +import org.chorem.pollen.business.dto.PollDTO; +import org.chorem.pollen.business.dto.PreventRuleDTO; +import org.chorem.pollen.business.dto.VotingListDTO; +import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PreventRule; +import org.chorem.pollen.business.persistence.VotingList; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.beans.BinderBuilder; +import org.nuiton.util.beans.BinderProvider; + +/** + * ConverterFactory + * + * Created: 22 févr. 2010 + * + * @author fdesbois + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ConverterHelper { + + private static BinderBuilder builder = new BinderBuilder(); + + private static final void prepare(Class<? extends TopiaEntity> entityClass, Class<?> dtoClass, String... properties) { + // Binder DTO -> Entity + builder.createBinderModel(dtoClass, entityClass). + addSimpleProperties(properties); + + BinderProvider.registerBinder(builder); + + // Binder Entity -> DTO + builder.createBinderModel(entityClass, dtoClass). + addSimpleProperties(properties); + //builder.addProperty(TopiaEntity.TOPIA_ID, "id"); + + BinderProvider.registerBinder(builder); + } + + public static void preparePollConverters() { + String[] properties = new String[] { + Poll.POLL_ID, + Poll.TITLE, + Poll.DESCRIPTION, + Poll.BEGIN_CHOICE_DATE, + Poll.END_CHOICE_DATE, + Poll.BEGIN_DATE, + Poll.END_DATE, + Poll.CLOSED, + Poll.ANONYMOUS, + Poll.ANONYMOUS_VOTE_ALLOWED, + Poll.PUBLIC_RESULTS, + Poll.CONTINUOUS_RESULTS, + Poll.CHOICE_ADD_ALLOWED, + Poll.MAX_CHOICE_NB + }; + + prepare(Poll.class, PollDTO.class, properties); + } + + public static void prepareChoiceConverters() { + String[] properties = new String[] { + Choice.NAME, + Choice.DESCRIPTION, + Choice.VALIDATE + }; + + prepare(Choice.class, ChoiceDTO.class, properties); + } + + public static void prepareVotingListConverters() { + String[] properties = new String[] { + VotingList.NAME, + VotingList.WEIGHT + }; + + prepare(VotingList.class, VotingListDTO.class, properties); + } + + public static void preparePollAccountConverters() { + String[] properties = new String[] { + PollAccount.ACCOUNT_ID, + PollAccount.VOTING_ID, + PollAccount.EMAIL + }; + + prepare(PollAccount.class, PollAccountDTO.class, properties); + } + + public static void preparePreventRuleConverters() { + String[] properties = new String[] { + PreventRule.ACTIVE, + PreventRule.METHOD, + PreventRule.ONE_TIME, + PreventRule.REPEATED, + PreventRule.SCOPE, + PreventRule.SENSIBILITY + }; + + prepare(PreventRule.class, PreventRuleDTO.class, properties); + } + + public static Choice convert(ChoiceDTO dto, Choice entity) { + BinderProvider.getBinder(ChoiceDTO.class, Choice.class).copy(dto, entity); + return entity; + } + + public static ChoiceDTO convert(Choice entity, ChoiceDTO dto) { + BinderProvider.getBinder(Choice.class, ChoiceDTO.class).copy(entity, dto); + dto.setId(entity.getTopiaId()); + return dto; + } + + public static Poll convert(PollDTO dto, Poll entity) { + BinderProvider.getBinder(PollDTO.class, Poll.class).copy(dto, entity); + return entity; + } + + public static PollDTO convert(Poll entity, PollDTO dto) { + BinderProvider.getBinder(Poll.class, PollDTO.class).copy(entity, dto); + dto.setId(entity.getTopiaId()); + return dto; + } + + public static VotingList convert(VotingListDTO dto, VotingList entity) { + BinderProvider.getBinder(VotingListDTO.class, VotingList.class).copy(dto, entity); + return entity; + } + + public static VotingListDTO convert(VotingList entity, VotingListDTO dto) { + BinderProvider.getBinder(VotingList.class, VotingListDTO.class).copy(entity, dto); + dto.setId(entity.getTopiaId()); + return dto; + } + + public static PollAccount convert(PollAccountDTO dto, PollAccount entity) { + BinderProvider.getBinder(PollAccountDTO.class, PollAccount.class).copy(dto, entity); + return entity; + } + + public static PollAccountDTO convert(PollAccount entity, PollAccountDTO dto) { + BinderProvider.getBinder(PollAccount.class, PollAccountDTO.class).copy(entity, dto); + dto.setId(entity.getTopiaId()); + return dto; + } + + public static PreventRule convert(PreventRuleDTO dto, PreventRule entity) { + BinderProvider.getBinder(PreventRuleDTO.class, PreventRule.class).copy(dto, entity); + return entity; + } + + public static PreventRuleDTO convert(PreventRule entity, PreventRuleDTO dto) { + BinderProvider.getBinder(PreventRule.class, PreventRuleDTO.class).copy(entity, dto); + dto.setId(entity.getTopiaId()); + return dto; + } + + +} Property changes on: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/ConverterHelper.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL" Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/DataPollConverter.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -26,7 +26,10 @@ import org.chorem.pollen.business.dto.PollDTO; import org.chorem.pollen.business.dto.PreventRuleDTO; import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.business.persistence.ChoiceTypeDAO; import org.chorem.pollen.business.persistence.Poll; +import org.chorem.pollen.business.persistence.PollenModelDAOHelper; import org.chorem.pollen.business.persistence.PreventRule; import org.chorem.pollen.business.services.ServiceChoice; import org.chorem.pollen.business.services.ServiceChoiceImpl; @@ -55,29 +58,40 @@ * * @param pollDTO le dto sondage * @param ePoll l'entité sondage + * @deprecated use */ - public void populatePollEntity(PollDTO pollDTO, Poll ePoll) - throws TopiaException { - ePoll.setPollId(pollDTO.getPollId()); - ePoll.setTitle(pollDTO.getTitle()); - ePoll.setDescription(pollDTO.getDescription()); - ePoll.setBeginChoiceDate(pollDTO.getBeginChoiceDate()); - ePoll.setEndChoiceDate(pollDTO.getEndChoiceDate()); - ePoll.setBeginDate(pollDTO.getBeginDate()); - ePoll.setEndDate(pollDTO.getEndDate()); - ePoll.setClosed(pollDTO.isClosed()); - ePoll.setAnonymous(pollDTO.isAnonymous()); - ePoll.setAnonymousVoteAllowed(pollDTO.isAnonymousVoteAllowed()); - ePoll.setPublicResults(pollDTO.isPublicResults()); - ePoll.setContinuousResults(pollDTO.isContinuousResults()); - ePoll.setChoiceAddAllowed(pollDTO.isChoiceAddAllowed()); - ePoll.setMaxChoiceNb(pollDTO.getMaxChoiceNb()); + @Deprecated + public void populatePollEntity(PollDTO pollDTO, Poll ePoll) { + //Binder bind; + + ConverterHelper.convert(pollDTO, ePoll); + EnumController enumCtrl = new EnumController(super.transaction); enumCtrl.setChoiceType(pollDTO.getChoiceType(), ePoll); enumCtrl.setPollType(pollDTO.getPollType(), ePoll); enumCtrl.setVoteCounting(pollDTO.getVoteCounting(), ePoll); + +// ePoll.setPollId(pollDTO.getPollId()); +// ePoll.setTitle(pollDTO.getTitle()); +// ePoll.setDescription(pollDTO.getDescription()); +// ePoll.setBeginChoiceDate(pollDTO.getBeginChoiceDate()); +// ePoll.setEndChoiceDate(pollDTO.getEndChoiceDate()); +// ePoll.setBeginDate(pollDTO.getBeginDate()); +// ePoll.setEndDate(pollDTO.getEndDate()); +// ePoll.setClosed(pollDTO.isClosed()); +// ePoll.setAnonymous(pollDTO.isAnonymous()); +// ePoll.setAnonymousVoteAllowed(pollDTO.isAnonymousVoteAllowed()); +// ePoll.setPublicResults(pollDTO.isPublicResults()); +// ePoll.setContinuousResults(pollDTO.isContinuousResults()); +// ePoll.setChoiceAddAllowed(pollDTO.isChoiceAddAllowed()); +// ePoll.setMaxChoiceNb(pollDTO.getMaxChoiceNb()); +// EnumController enumCtrl = new EnumController(transaction); +// enumCtrl.setChoiceType(pollDTO.getChoiceType(), entity); +// enumCtrl.setPollType(pollDTO.getPollType(), entity); +// enumCtrl.setVoteCounting(pollDTO.getVoteCounting(), entity); + /*if (pollDTO.getCreatorId().length() > 0) { PollAccountDAO pollAccountDAO = PollenModelDAOHelper.getPollAccountDAO(super.transaction); PollAccount PollAccountEntity = pollAccountDAO.findByTopiaId(pollDTO.getCreatorId()); @@ -93,25 +107,29 @@ */ public PollDTO createPollDTO(Poll ePoll) { PollDTO pollDTO = new PollDTO(); - pollDTO.setId(ePoll.getTopiaId()); - pollDTO.setPollId(ePoll.getPollId()); - pollDTO.setTitle(ePoll.getTitle()); - pollDTO.setDescription(ePoll.getDescription()); - pollDTO.setBeginChoiceDate(ePoll.getBeginChoiceDate()); - pollDTO.setEndChoiceDate(ePoll.getEndChoiceDate()); - pollDTO.setBeginDate(ePoll.getBeginDate()); - pollDTO.setEndDate(ePoll.getEndDate()); - pollDTO.setAnonymous(ePoll.getAnonymous()); - pollDTO.setAnonymousVoteAllowed(ePoll.getAnonymousVoteAllowed()); - pollDTO.setPublicResults(ePoll.getPublicResults()); - pollDTO.setContinuousResults(ePoll.getContinuousResults()); - pollDTO.setChoiceAddAllowed(ePoll.getChoiceAddAllowed()); - pollDTO.setClosed(ePoll.getClosed()); - pollDTO.setMaxChoiceNb(ePoll.getMaxChoiceNb()); - pollDTO.setChoiceType(EnumController.getChoiceType(ePoll)); - pollDTO.setPollType(EnumController.getPollType(ePoll)); - pollDTO.setVoteCounting(EnumController.getVoteCountingType(ePoll)); + ConverterHelper.convert(ePoll, pollDTO); + //pollDTO.setId(ePoll.getTopiaId()); + +// pollDTO.setId(ePoll.getTopiaId()); +// pollDTO.setPollId(ePoll.getPollId()); +// pollDTO.setTitle(ePoll.getTitle()); +// pollDTO.setDescription(ePoll.getDescription()); +// pollDTO.setBeginChoiceDate(ePoll.getBeginChoiceDate()); +// pollDTO.setEndChoiceDate(ePoll.getEndChoiceDate()); +// pollDTO.setBeginDate(ePoll.getBeginDate()); +// pollDTO.setEndDate(ePoll.getEndDate()); +// pollDTO.setAnonymous(ePoll.getAnonymous()); +// pollDTO.setAnonymousVoteAllowed(ePoll.getAnonymousVoteAllowed()); +// pollDTO.setPublicResults(ePoll.getPublicResults()); +// pollDTO.setContinuousResults(ePoll.getContinuousResults()); +// pollDTO.setChoiceAddAllowed(ePoll.getChoiceAddAllowed()); +// pollDTO.setClosed(ePoll.getClosed()); +// pollDTO.setMaxChoiceNb(ePoll.getMaxChoiceNb()); +// pollDTO.setChoiceType(EnumController.getChoiceType(ePoll)); +// pollDTO.setPollType(EnumController.getPollType(ePoll)); +// pollDTO.setVoteCounting(EnumController.getVoteCountingType(ePoll)); + if (ePoll.getCreator() != null) { pollDTO.setCreatorId(ePoll.getCreator().getTopiaId()); pollDTO.setCreatorEmail(ePoll.getCreator().getEmail()); Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/converters/EnumController.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -41,6 +41,13 @@ super(transaction); } + /** + * + * @param type + * @param ePoll + * @deprecated use directly daos when needed + */ + @Deprecated public void setChoiceType(ChoiceType type, Poll ePoll) { try { if (type != null) { @@ -53,6 +60,8 @@ } } + + @Deprecated public void setPollType(PollType type, Poll ePoll) { try { if (type != null) { @@ -65,6 +74,8 @@ } } + + @Deprecated public void setVoteCounting(VoteCountingType type, Poll ePoll) { try { if (type != null) { Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/ChoiceDTO.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -37,15 +37,15 @@ private String description = ""; - private int value = 0; + private Integer value = 0; - private boolean validate = false; + private Boolean validate = false; private String voteId = ""; private String pollId = ""; - private boolean hidden = false; + private Boolean hidden = false; public ChoiceDTO() { @@ -85,19 +85,23 @@ this.description = description; } - public int getValue() { + public Integer getValue() { return value; } - public void setValue(int value) { + public void setValue(Integer value) { this.value = value; } - public boolean isValidate() { + public Boolean isValidate() { return validate; } - public void setValidate(boolean validate) { + public Boolean getValidate() { + return isValidate(); + } + + public void setValidate(Boolean validate) { this.validate = validate; } @@ -117,11 +121,15 @@ this.pollId = pollId; } - public boolean isHidden() { + public Boolean isHidden() { return hidden; } - public void setHidden(boolean hidden) { + public Boolean getHidden() { + return isHidden(); + } + + public void setHidden(Boolean hidden) { this.hidden = hidden; } } \ No newline at end of file Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollAccountDTO.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -39,9 +39,9 @@ private String email = ""; - private double weight = 1; + private Double weight = 1.; - private boolean hasVoted = false; + private Boolean hasVoted = false; private String votingListId = ""; @@ -107,19 +107,23 @@ this.email = email; } - public double getWeight() { + public Double getWeight() { return weight; } - public void setWeight(double weight) { + public void setWeight(Double weight) { this.weight = weight; } - public boolean isHasVoted() { + public Boolean isHasVoted() { return hasVoted; } - public void setHasVoted(boolean hasVoted) { + public Boolean getHasVoted() { + return isHasVoted(); + } + + public void setHasVoted(Boolean hasVoted) { this.hasVoted = hasVoted; } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PollDTO.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -50,19 +50,19 @@ private Date endChoiceDate = null; - private int maxChoiceNb = 0; + private Integer maxChoiceNb = 0; - private boolean closed = false; + private Boolean closed = false; - private boolean choiceAddAllowed = false; + private Boolean choiceAddAllowed = false; - private boolean anonymousVoteAllowed = false; + private Boolean anonymousVoteAllowed = false; - private boolean anonymous = false; + private Boolean anonymous = false; - private boolean publicResults = false; + private Boolean publicResults = false; - private boolean continuousResults = false; + private Boolean continuousResults = false; private PollType pollType = null; @@ -72,6 +72,7 @@ private String userId = ""; + // Carefull, not TopiaId but pollAccount.votingId = creator name private String creatorId = ""; private String creatorEmail = ""; @@ -180,59 +181,83 @@ this.beginChoiceDate = beginChoiceDate; } - public int getMaxChoiceNb() { + public Integer getMaxChoiceNb() { return maxChoiceNb; } - public void setMaxChoiceNb(int maxChoiceNb) { + public void setMaxChoiceNb(Integer maxChoiceNb) { this.maxChoiceNb = maxChoiceNb; } - public boolean isClosed() { + public Boolean isClosed() { return closed; } - public void setClosed(boolean closed) { + public Boolean getClosed() { + return isClosed(); + } + + public void setClosed(Boolean closed) { this.closed = closed; } - public boolean isChoiceAddAllowed() { + public Boolean isChoiceAddAllowed() { return choiceAddAllowed; } - public void setChoiceAddAllowed(boolean choiceAddAllowed) { + public Boolean getChoiceAddAllowed() { + return isChoiceAddAllowed(); + } + + public void setChoiceAddAllowed(Boolean choiceAddAllowed) { this.choiceAddAllowed = choiceAddAllowed; } - public boolean isAnonymousVoteAllowed() { + public Boolean isAnonymousVoteAllowed() { return anonymousVoteAllowed; } - public void setAnonymousVoteAllowed(boolean anonymousVoteAllowed) { + public Boolean getAnonymousVoteAllowed() { + return isAnonymousVoteAllowed(); + } + + public void setAnonymousVoteAllowed(Boolean anonymousVoteAllowed) { this.anonymousVoteAllowed = anonymousVoteAllowed; } - public boolean isAnonymous() { + public Boolean isAnonymous() { return anonymous; } - public void setAnonymous(boolean anonymous) { + public Boolean getAnonymous() { + return isAnonymous(); + } + + public void setAnonymous(Boolean anonymous) { this.anonymous = anonymous; } - public boolean isPublicResults() { + public Boolean isPublicResults() { return publicResults; } - public void setPublicResults(boolean publicResults) { + public Boolean getPublicResults() { + return isPublicResults(); + } + + public void setPublicResults(Boolean publicResults) { this.publicResults = publicResults; } - public boolean isContinuousResults() { + public Boolean isContinuousResults() { return continuousResults; } - public void setContinuousResults(boolean continuousResults) { + public Boolean getContinuousResults() { + return isContinuousResults(); + } + + public void setContinuousResults(Boolean continuousResults) { this.continuousResults = continuousResults; } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/PreventRuleDTO.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -33,13 +33,13 @@ private String scope = ""; - private int sensibility = 0; + private Integer sensibility = 0; - private boolean active = true; + private Boolean active = true; - private boolean oneTime = false; + private Boolean oneTime = false; - private boolean repeated = false; + private Boolean repeated = false; private String method = ""; @@ -93,35 +93,47 @@ this.scope = scope; } - public int getSensibility() { + public Integer getSensibility() { return sensibility; } - public void setSensibility(int sensibility) { + public void setSensibility(Integer sensibility) { this.sensibility = sensibility; } - public boolean isActive() { + public Boolean isActive() { return active; } - public void setActive(boolean active) { + public Boolean getActive() { + return isActive(); + } + + public void setActive(Boolean active) { this.active = active; } - public boolean isOneTime() { + public Boolean isOneTime() { return oneTime; } - public void setOneTime(boolean oneTime) { + public Boolean getOneTime() { + return isOneTime(); + } + + public void setOneTime(Boolean oneTime) { this.oneTime = oneTime; } - public boolean isRepeated() { + public Boolean isRepeated() { return repeated; } - public void setRepeated(boolean repeated) { + public Boolean getRepeated() { + return isRepeated(); + } + + public void setRepeated(Boolean repeated) { this.repeated = repeated; } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/dto/VotingListDTO.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -33,7 +33,7 @@ private String name = ""; - private double weight = 1; + private Double weight = 1.; private String pollId = ""; @@ -71,11 +71,11 @@ this.name = name; } - public double getWeight() { + public Double getWeight() { return weight; } - public void setWeight(double weight) { + public void setWeight(Double weight) { this.weight = weight; } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServiceList.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -38,7 +38,9 @@ * * @param votingList la liste * @return identifiant de la liste créée + * @deprecated useless method : used only in tests */ + @Deprecated public String createVotingList(VotingListDTO votingList); /** @@ -48,7 +50,9 @@ * @param pollId l'identifiant du sondage * @param transaction la transaction du sondage * @return les groupes créés + * @deprecated useless method : used nowhere */ + @Deprecated public List<VotingList> createVotingLists(List<VotingListDTO> votingLists, String pollId, TopiaContext transaction); @@ -65,7 +69,9 @@ * * @param votingListId l'identifiant de la liste * @return true si la liste a été mise à jours + * @deprecated useless method : used only in tests */ + @Deprecated public boolean deleteVotingList(String votingListId); /** @@ -73,7 +79,9 @@ * * @param votingListId l'identifiant de la liste * @return la liste + * @deprecated useless method : used only in tests */ + @Deprecated public VotingListDTO findVotingListById(String votingListId); /** @@ -81,7 +89,9 @@ * * @param name le nom de la liste * @return les listes + * @deprecated useless method : used only in tests */ + @Deprecated public List<VotingListDTO> findVotingListByName(String name); /** @@ -89,7 +99,9 @@ * * @param properties filtre sur les champs de la table VotingList * @return les listes de votants + * @deprecated useless method : used only in tests */ + @Deprecated public List<VotingListDTO> selectVotingList(Map<String, Object> properties); /** @@ -107,7 +119,9 @@ * @param userId l'identifiant de l'utilisateur * @param transaction la transaction du sondage * @return true si toutes les listes ont été créés + * @deprecated useless method : used nowhere */ + @Deprecated public boolean createPersonLists(List<PersonListDTO> lists, String userId, TopiaContext transaction); @@ -148,7 +162,9 @@ * * @param name le nom de la liste * @return les listes + * @deprecated useless method : used only in tests */ + @Deprecated public List<PersonListDTO> findPersonListByName(String name); /** @@ -164,6 +180,8 @@ * * @param properties filtre sur les champs de la table personList * @return les listes de votants + * @deprecated useless method : used only in tests */ + @Deprecated public List<PersonListDTO> selectPersonList(Map<String, Object> properties); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePoll.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -74,7 +74,9 @@ * * @param pollName nom du sondage * @return liste de sondages + * @deprecated useless method : only used in tests */ + @Deprecated public List<PollDTO> findPollsByName(String pollName); /** @@ -124,6 +126,8 @@ * @param pollId identifiant topia du sondage * @param voteId l'identiiant topiaId du vote * @return true si le vote a été ajouté + * @deprecated useless method : used nowhere */ + @Deprecated public boolean addVoteToPoll(String pollId, String voteId); } \ No newline at end of file Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollAccount.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -36,7 +36,9 @@ * * @param pollAccount le compte à creer * @return le topiaId du compte créé + * @deprecated useless method : not used in UI */ + @Deprecated public String createPollAccount(PollAccountDTO pollAccount); /** @@ -46,7 +48,9 @@ * @param email l'email du votant * @param userId l'identifiant de l'utilisateur * @return le topiaId du compte créé + * @deprecated useless method : not used in UI */ + @Deprecated public PollAccount createPollAccount(String votingId, String email, String userId); @@ -56,7 +60,9 @@ * @param pollAccounts les comptes à creer * @param transaction la transaction * @return les comptes créés + * @deprecated useless method : not used in UI */ + @Deprecated public List<PollAccount> createPollAccounts( List<PollAccountDTO> pollAccounts, TopiaContext transaction); @@ -97,7 +103,9 @@ * * @param userId l'identifiant de l'utilisateur * @return la liste des comptes de l'utilisateur + * @deprecated useless method : used nowhere */ + @Deprecated public List<PollAccountDTO> findPollAccountsByUser(String userId); /** @@ -105,7 +113,9 @@ * * @param properties filtre sur les champs de la table pollAccount * @return les comptes + * @deprecated useless method : used nowhere */ + @Deprecated public List<PollAccountDTO> selectPollAccounts( Map<String, Object> properties); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePollImpl.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -17,28 +17,47 @@ package org.chorem.pollen.business.services; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; + import java.util.Set; -import java.util.UUID; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.converters.ConverterHelper; import org.chorem.pollen.business.converters.DataPollConverter; +import org.chorem.pollen.business.dto.ChoiceDTO; +import org.chorem.pollen.business.dto.PollAccountDTO; import org.chorem.pollen.business.dto.PollDTO; +import org.chorem.pollen.business.dto.PreventRuleDTO; +import org.chorem.pollen.business.dto.VotingListDTO; +import org.chorem.pollen.business.persistence.Choice; +import org.chorem.pollen.business.persistence.ChoiceImpl; +import org.chorem.pollen.business.persistence.ChoiceType; +import org.chorem.pollen.business.persistence.ChoiceTypeDAO; import org.chorem.pollen.business.persistence.PersonToList; +import org.chorem.pollen.business.persistence.PersonToListDAO; import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.PollAccount; +import org.chorem.pollen.business.persistence.PollAccountDAO; import org.chorem.pollen.business.persistence.PollDAO; +import org.chorem.pollen.business.persistence.PollType; +import org.chorem.pollen.business.persistence.PollTypeDAO; import org.chorem.pollen.business.persistence.PollenModelDAOHelper; +import org.chorem.pollen.business.persistence.PreventRule; +import org.chorem.pollen.business.persistence.PreventRuleImpl; import org.chorem.pollen.business.persistence.UserAccount; import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.business.persistence.Vote; +import org.chorem.pollen.business.persistence.VoteCounting; +import org.chorem.pollen.business.persistence.VoteCountingDAO; import org.chorem.pollen.business.persistence.VoteDAO; import org.chorem.pollen.business.persistence.VotingList; +import org.chorem.pollen.business.persistence.VotingListImpl; import org.chorem.pollen.business.utils.ContextUtil; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; /** * Implémentation du service de gestion des sondages. @@ -56,6 +75,11 @@ private static final Log log = LogFactory.getLog(ServicePollImpl.class); public ServicePollImpl() { + ConverterHelper.preparePollConverters(); + ConverterHelper.prepareChoiceConverters(); + ConverterHelper.prepareVotingListConverters(); + ConverterHelper.preparePollAccountConverters(); + ConverterHelper.preparePreventRuleConverters(); } @Override @@ -63,69 +87,84 @@ TopiaContext transaction = null; String topiaId = ""; try { + if (pollDTO.getPollType() == null) { + throw new NullPointerException( + "PollType can't be null to create a Poll"); + } + if (pollDTO.getChoiceType() == null) { + throw new NullPointerException( + "ChoiceType can't be null to create a Poll"); + } + if (pollDTO.getVoteCounting() == null) { + throw new NullPointerException( + "VoteCounting can't be null to create a Poll"); + } + transaction = rootContext.beginTransaction(); pollDAO = PollenModelDAOHelper.getPollDAO(transaction); - Poll pollEntity = pollDAO.create(); + Poll entity = ConverterHelper.convert(pollDTO, pollDAO.create()); + // ** Create new poll ID for urls + entity.setPollId(ContextUtil.createPollenUrlId()); - // Identifiant du sondage - String id = UUID.randomUUID().toString(); - pollDTO.setPollId(id.replaceAll("-", "")); + // FIXME-FD20100222 Change model to put name values directly in Poll + // entity + ChoiceTypeDAO choiceTypeDAO = + PollenModelDAOHelper.getChoiceTypeDAO(transaction); + ChoiceType choiceType = + choiceTypeDAO.findByName(pollDTO.getChoiceType().name()); + PollTypeDAO pollTypeDAO = + PollenModelDAOHelper.getPollTypeDAO(transaction); + PollType pollType = + pollTypeDAO.findByName(pollDTO.getPollType().name()); + VoteCountingDAO voteCountingDAO = + PollenModelDAOHelper.getVoteCountingDAO(transaction); + VoteCounting voteCounting = + voteCountingDAO.findByName(pollDTO.getVoteCounting().name()); - converter.setTransaction(transaction); - converter.populatePollEntity(pollDTO, pollEntity); + entity.setChoiceType(choiceType); + entity.setPollType(pollType); + entity.setVoteCounting(voteCounting); - // Création du pollAccount associé au sondage - // FIXME do not call a Service from an other one - ServicePollAccount spa = new ServicePollAccountImpl(); - PollAccount pollAccountEntity = spa.createPollAccount(pollDTO - .getCreatorId(), pollDTO.getCreatorEmail(), pollDTO - .getUserId()); - pollEntity.setCreator(pollAccountEntity); + // ** Creator managment + PollAccount creator = prepareCreator(transaction, pollDTO); + entity.setCreator(creator); - if (log.isDebugEnabled()) { - log.debug("userId: " + pollDTO.getUserId() - + ", pollAccountEntity created: " - + (pollAccountEntity != null)); + // ** Create new choices + for (ChoiceDTO choiceDTO : pollDTO.getChoiceDTOs()) { + // Use new instance of Choice, the creation will be done by + // the poll entity + Choice choice = + ConverterHelper.convert(choiceDTO, new ChoiceImpl()); + choice.setPoll(entity); } - topiaId = pollEntity.getTopiaId(); + // ** Create new votingLists + for (VotingListDTO listDTO : pollDTO.getVotingListDTOs()) { + VotingList votingList = createVotingList(transaction, listDTO); + votingList.setPoll(entity); + } - // Création des choix du sondage - // FIXME do not call a Service from an other one - ServiceChoice sChoice = new ServiceChoiceImpl(); - pollEntity.setChoice(sChoice.createChoices(pollDTO.getChoiceDTOs(), - topiaId, transaction)); + // ** Create new preventRules + for (PreventRuleDTO ruleDTO : pollDTO.getPreventRuleDTOs()) { + // Use new instance of PreventRule, the creation will be done by + // the poll entity + PreventRule rule = + ConverterHelper.convert(ruleDTO, new PreventRuleImpl()); + rule.setPoll(entity); + } - // Création des commentaires du sondage - // FIXME do not call a Service from an other one - ServiceComment sComment = new ServiceCommentImpl(); - pollEntity.setComment(sComment.createComments(pollDTO - .getCommentDTOs(), topiaId, transaction)); - - // Création des listes de votants du sondage - // FIXME do not call a Service from an other one - ServiceList sList = new ServiceListImpl(); - pollEntity.setVotingList(sList.createVotingLists(pollDTO - .getVotingListDTOs(), topiaId, transaction)); - - // Création des règle de notification pour le sondage - // FIXME do not call a Service from an other one - ServicePreventRule sPreventRule = new ServicePreventRuleImpl(); - pollEntity.setPreventRule(sPreventRule.createPreventRules(pollDTO - .getPreventRuleDTOs(), topiaId, transaction)); - transaction.commitTransaction(); if (log.isDebugEnabled()) { - log.debug("creator after creation: " + pollEntity.getCreator()); + log.debug("creator after creation: " + entity.getCreator()); } if (log.isDebugEnabled()) { log.debug("Entity created: " + topiaId); } - return topiaId; + return entity.getTopiaId(); } catch (Exception e) { ContextUtil.doCatch(e, transaction); return ""; @@ -133,7 +172,91 @@ ContextUtil.doFinally(transaction); } } + + /** + * Prepare pollAccount as creator for {@code poll} save. If userId is + * defined, the pollAccount will be searched in database testing all fields + * (user, creatorId as votingId and email). If no result is found or no + * userId, a new pollAccount is created. + * + * @param transaction current TopiaContext + * @param poll PollDTO which contains creator data (userId, creatorId, + * creatorEmail) + * @return the PollAccount used as creator for this poll + * @throws TopiaException + */ + private static final PollAccount prepareCreator(TopiaContext transaction, + PollDTO poll) throws TopiaException { + + // Search user from database + UserAccount user = PollenModelDAOHelper.getUserAccountDAO(transaction). + findByTopiaId(poll.getUserId()); + + // Prepare properties for find or create + Map<String, Object> accountProperties = new HashMap<String, Object>(); + accountProperties.put(PollAccount.USER_ACCOUNT, user); + accountProperties.put(PollAccount.VOTING_ID, poll.getCreatorId()); + accountProperties.put(PollAccount.EMAIL, poll.getCreatorEmail()); + + PollAccountDAO accountDAO = + PollenModelDAOHelper.getPollAccountDAO(transaction); + + PollAccount creator = null; + // Get existing account (profile) for user + if (user != null) { + creator = accountDAO.findByProperties(accountProperties); + } + // Create new account if account properties changed or no user found + if (creator == null) { + creator = accountDAO.create(accountProperties); + } + return creator; + } + + /** + * Create a new votingList from a VotingListDTO. Used when poll is created. + * Each pollAccount of the list will be created unless it already exists + * in database (Don't know if needed because pollAccounts can't be loaded + * in a new poll creation). + * + * @param transaction current TopiaContext + * @param listDTO VotingListDTO source + * @return VotingList entity created + * @throws TopiaException + */ + private static final VotingList createVotingList(TopiaContext transaction, + VotingListDTO listDTO) throws TopiaException { + + // Use new instance of VotingList, the creation will be done by + // the poll entity + VotingList votingList = + ConverterHelper.convert(listDTO, new VotingListImpl()); + + PollAccountDAO pollAccountDAO = + PollenModelDAOHelper.getPollAccountDAO(transaction); + + for (PollAccountDTO accountDTO : listDTO.getPollAccountDTOs()) { + double weight = accountDTO.getWeight(); + PollAccount account = + pollAccountDAO.findByTopiaId(accountDTO.getId()); + + // Create a new PollAccount if not already exists + if (account == null) { + account = + ConverterHelper.convert(accountDTO, pollAccountDAO.create()); + } + + // Create association between VotingList and PollAccount + PollenModelDAOHelper.getPersonToListDAO(transaction).create( + PersonToList.POLL_ACCOUNT, account, + PersonToList.VOTING_LIST, votingList, + PersonToList.WEIGHT, weight); + } + + return votingList; + } + @Override public boolean updatePoll(PollDTO pollDTO) { TopiaContext transaction = null; @@ -209,7 +332,7 @@ result = converter.createPollDTO(pollEntity); } - transaction.commitTransaction(); + //transaction.commitTransaction(); if (log.isDebugEnabled()) { log.debug("Entity found: " @@ -241,7 +364,7 @@ result = converter.createPollDTO(pollEntity); } - transaction.commitTransaction(); + //transaction.commitTransaction(); if (log.isDebugEnabled()) { log.debug("Entity found: " Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/services/ServicePreventRule.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -72,7 +72,9 @@ * * @param preventRuleId l'identifiant de la règle * @return la règle + * @deprecated useless method : used only in tests */ + @Deprecated public PreventRuleDTO findPreventRuleById(String preventRuleId); /** @@ -80,7 +82,9 @@ * * @param properties filtre sur les champs de la table preventRule * @return les règles + * @deprecated useless method : used only in tests */ + @Deprecated public List<PreventRuleDTO> selectPreventRules( Map<String, Object> properties); } Modified: trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java =================================================================== --- trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/java/org/chorem/pollen/business/utils/ContextUtil.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -18,12 +18,14 @@ import java.util.Properties; +import java.util.UUID; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.business.converters.ConverterHelper; import org.chorem.pollen.business.persistence.ChoiceTypeDAO; import org.chorem.pollen.business.persistence.PollTypeDAO; import org.chorem.pollen.business.persistence.PollenModelDAOHelper; @@ -333,4 +335,8 @@ } } } + + public static String createPollenUrlId() { + return UUID.randomUUID().toString().replaceAll("-", ""); + } } \ No newline at end of file Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.ChoiceImpl" table="choice" node="org.chorem.pollen.business.persistence.ChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Choice" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="description" type="text" access="field" column="description" node="description"/> - <property name="validate" type="java.lang.Boolean" access="field" column="validate" node="validate"/> - <bag name="voteVoteToChoice" inverse="true" lazy="true" cascade="all,delete-orphan" node="voteVoteToChoice" embed-xml="false"> - <key column="choice"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.ChoiceImpl" node="org.chorem.pollen.business.persistence.ChoiceImpl" proxy="org.chorem.pollen.business.persistence.Choice" table="choice"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="description" name="description" node="description" type="text"/> + <property access="field" column="validate" name="validate" node="validate" type="java.lang.Boolean"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="voteVoteToChoice" node="voteVoteToChoice"> + <key column="choice"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" table="choiceType" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.ChoiceType" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" proxy="org.chorem.pollen.business.persistence.ChoiceType" table="choiceType"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.CommentImpl" table="comment" node="org.chorem.pollen.business.persistence.CommentImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Comment" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="text" type="text" access="field" column="text" node="text"/> - <property name="postDate" type="java.util.Date" access="field" column="postDate" node="postDate"/> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="pollAccount" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" node="pollAccount/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.CommentImpl" node="org.chorem.pollen.business.persistence.CommentImpl" proxy="org.chorem.pollen.business.persistence.Comment" table="comment"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="text" name="text" node="text" type="text"/> + <property access="field" column="postDate" name="postDate" node="postDate" type="java.util.Date"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" embed-xml="false" name="pollAccount" node="pollAccount/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PersonListImpl" table="personList" node="org.chorem.pollen.business.persistence.PersonListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonList" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <many-to-one name="owner" class="org.chorem.pollen.business.persistence.UserAccountImpl" column="owner" node="owner/@topiaId" embed-xml="false"/> - <bag name="pollAccount" inverse="true" lazy="true" cascade="all,delete-orphan" node="pollAccount" embed-xml="false"> - <key column="personList"/> - <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PersonListImpl" node="org.chorem.pollen.business.persistence.PersonListImpl" proxy="org.chorem.pollen.business.persistence.PersonList" table="personList"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <many-to-one class="org.chorem.pollen.business.persistence.UserAccountImpl" column="owner" embed-xml="false" name="owner" node="owner/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="pollAccount" node="pollAccount"> + <key column="personList"/> + <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PersonToListImpl" table="personToList" node="org.chorem.pollen.business.persistence.PersonToListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonToList" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="weight" type="double" access="field" column="weight" node="weight"/> - <property name="hasVoted" type="text" access="field" column="hasVoted" node="hasVoted"/> - <many-to-one name="votingList" class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" node="votingList/@topiaId" embed-xml="false" /> - <many-to-one name="pollAccount" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" node="pollAccount/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PersonToListImpl" node="org.chorem.pollen.business.persistence.PersonToListImpl" proxy="org.chorem.pollen.business.persistence.PersonToList" table="personToList"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="weight" name="weight" node="weight" type="double"/> + <property access="field" column="hasVoted" name="hasVoted" node="hasVoted" type="text"/> + <many-to-one class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" embed-xml="false" name="votingList" node="votingList/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" embed-xml="false" name="pollAccount" node="pollAccount/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,29 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PollAccountImpl" table="pollAccount" node="org.chorem.pollen.business.persistence.PollAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollAccount" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="votingId" type="text" access="field" column="votingId" node="votingId"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <bag name="votingListPersonToList" inverse="true" lazy="true" cascade="all,delete-orphan" node="votingListPersonToList" embed-xml="false"> - <key column="pollAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="pollsCreated" inverse="true" lazy="true" node="pollsCreated" embed-xml="false"> - <key column="creator"/> - <one-to-many class="org.chorem.pollen.business.persistence.PollImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="comment" inverse="true" lazy="true" node="comment" embed-xml="false"> - <key column="pollAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="vote" inverse="true" lazy="true" node="vote" embed-xml="false"> - <key column="pollAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="personList" class="org.chorem.pollen.business.persistence.PersonListImpl" column="personList" node="personList/@topiaId" embed-xml="false"/> - <many-to-one name="userAccount" class="org.chorem.pollen.business.persistence.UserAccountImpl" column="userAccount" node="userAccount/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PollAccountImpl" node="org.chorem.pollen.business.persistence.PollAccountImpl" proxy="org.chorem.pollen.business.persistence.PollAccount" table="pollAccount"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="votingId" name="votingId" node="votingId" type="text"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="votingListPersonToList" node="votingListPersonToList"> + <key column="pollAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="pollsCreated" node="pollsCreated"> + <key column="creator"/> + <one-to-many class="org.chorem.pollen.business.persistence.PollImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="comment" node="comment"> + <key column="pollAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="vote" node="vote"> + <key column="pollAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PersonListImpl" column="personList" embed-xml="false" name="personList" node="personList/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.UserAccountImpl" column="userAccount" embed-xml="false" name="userAccount" node="userAccount/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,50 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PollImpl" table="poll" node="org.chorem.pollen.business.persistence.PollImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Poll" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="pollId" type="text" access="field" column="pollId" node="pollId"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="description" type="text" access="field" column="description" node="description"/> - <property name="beginChoiceDate" type="java.util.Date" access="field" column="beginChoiceDate" node="beginChoiceDate"/> - <property name="beginDate" type="java.util.Date" access="field" column="beginDate" node="beginDate"/> - <property name="endDate" type="java.util.Date" access="field" column="endDate" node="endDate"/> - <property name="maxChoiceNb" type="int" access="field" column="maxChoiceNb" node="maxChoiceNb"/> - <property name="closed" type="java.lang.Boolean" access="field" column="closed" node="closed"/> - <property name="choiceAddAllowed" type="java.lang.Boolean" access="field" column="choiceAddAllowed" node="choiceAddAllowed"/> - <property name="anonymousVoteAllowed" type="java.lang.Boolean" access="field" column="anonymousVoteAllowed" node="anonymousVoteAllowed"/> - <property name="anonymous" type="java.lang.Boolean" access="field" column="anonymous" node="anonymous"/> - <property name="publicResults" type="java.lang.Boolean" access="field" column="publicResults" node="publicResults"/> - <property name="continuousResults" type="java.lang.Boolean" access="field" column="continuousResults" node="continuousResults"/> - <bag name="vote" inverse="true" lazy="true" cascade="all,delete-orphan" node="vote" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="choice" inverse="true" lazy="true" cascade="all,delete-orphan" node="choice" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.ChoiceImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="result" inverse="true" lazy="true" cascade="all,delete-orphan" node="result" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.ResultImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="creator" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="creator" node="creator/@topiaId" embed-xml="false"/> - <bag name="comment" inverse="true" lazy="true" node="comment" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="preventRule" inverse="true" lazy="true" node="preventRule" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.PreventRuleImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="votingList" inverse="true" lazy="true" cascade="all,delete-orphan" node="votingList" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.VotingListImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="pollType" class="org.chorem.pollen.business.persistence.PollTypeImpl" column="pollType" node="pollType/@topiaId" embed-xml="false"/> - <many-to-one name="choiceType" class="org.chorem.pollen.business.persistence.ChoiceTypeImpl" column="choiceType" node="choiceType/@topiaId" embed-xml="false"/> - <many-to-one name="voteCounting" class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" node="voteCounting/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PollImpl" node="org.chorem.pollen.business.persistence.PollImpl" proxy="org.chorem.pollen.business.persistence.Poll" table="poll"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="pollId" name="pollId" node="pollId" type="text"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="description" name="description" node="description" type="text"/> + <property access="field" column="beginChoiceDate" name="beginChoiceDate" node="beginChoiceDate" type="java.util.Date"/> + <property access="field" column="beginDate" name="beginDate" node="beginDate" type="java.util.Date"/> + <property access="field" column="endDate" name="endDate" node="endDate" type="java.util.Date"/> + <property access="field" column="maxChoiceNb" name="maxChoiceNb" node="maxChoiceNb" type="int"/> + <property access="field" column="closed" name="closed" node="closed" type="java.lang.Boolean"/> + <property access="field" column="choiceAddAllowed" name="choiceAddAllowed" node="choiceAddAllowed" type="java.lang.Boolean"/> + <property access="field" column="anonymousVoteAllowed" name="anonymousVoteAllowed" node="anonymousVoteAllowed" type="java.lang.Boolean"/> + <property access="field" column="anonymous" name="anonymous" node="anonymous" type="java.lang.Boolean"/> + <property access="field" column="publicResults" name="publicResults" node="publicResults" type="java.lang.Boolean"/> + <property access="field" column="continuousResults" name="continuousResults" node="continuousResults" type="java.lang.Boolean"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="vote" node="vote"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="choice" node="choice"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.ChoiceImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="result" node="result"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.ResultImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="creator" embed-xml="false" name="creator" node="creator/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="comment" node="comment"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="preventRule" node="preventRule"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.PreventRuleImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="votingList" node="votingList"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.VotingListImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollTypeImpl" column="pollType" embed-xml="false" name="pollType" node="pollType/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.ChoiceTypeImpl" column="choiceType" embed-xml="false" name="choiceType" node="choiceType/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" embed-xml="false" name="voteCounting" node="voteCounting/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PollTypeImpl" table="pollType" node="org.chorem.pollen.business.persistence.PollTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollType" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PollTypeImpl" node="org.chorem.pollen.business.persistence.PollTypeImpl" proxy="org.chorem.pollen.business.persistence.PollType" table="pollType"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PreventRuleImpl" table="preventRule" node="org.chorem.pollen.business.persistence.PreventRuleImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PreventRule" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="scope" type="text" access="field" column="scope" node="scope"/> - <property name="sensibility" type="int" access="field" column="sensibility" node="sensibility"/> - <property name="repeated" type="java.lang.Boolean" access="field" column="repeated" node="repeated"/> - <property name="method" type="text" access="field" column="method" node="method"/> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PreventRuleImpl" node="org.chorem.pollen.business.persistence.PreventRuleImpl" proxy="org.chorem.pollen.business.persistence.PreventRule" table="preventRule"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="scope" name="scope" node="scope" type="text"/> + <property access="field" column="sensibility" name="sensibility" node="sensibility" type="int"/> + <property access="field" column="repeated" name="repeated" node="repeated" type="java.lang.Boolean"/> + <property access="field" column="method" name="method" node="method" type="text"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.ResultImpl" table="result" node="org.chorem.pollen.business.persistence.ResultImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Result" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="ResultValue" type="text" access="field" column="resultValue" node="ResultValue"/> - <property name="byGroup" type="java.lang.Boolean" access="field" column="byGroup" node="byGroup"/> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="voteCounting" class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" node="voteCounting/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.ResultImpl" node="org.chorem.pollen.business.persistence.ResultImpl" proxy="org.chorem.pollen.business.persistence.Result" table="result"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="resultValue" name="ResultValue" node="ResultValue" type="text"/> + <property access="field" column="byGroup" name="byGroup" node="byGroup" type="java.lang.Boolean"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" embed-xml="false" name="voteCounting" node="voteCounting/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.UserAccountImpl" table="userAccount" node="org.chorem.pollen.business.persistence.UserAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.UserAccount" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="administrator" type="java.lang.Boolean" access="field" column="administrator" node="administrator"/> - <property name="langage" type="text" access="field" column="langage" node="langage"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <bag name="favoriteList" inverse="true" lazy="true" node="favoriteList" embed-xml="false"> - <key column="owner"/> - <one-to-many class="org.chorem.pollen.business.persistence.PersonListImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="pollAccount" inverse="true" lazy="true" node="pollAccount" embed-xml="false"> - <key column="userAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.UserAccountImpl" node="org.chorem.pollen.business.persistence.UserAccountImpl" proxy="org.chorem.pollen.business.persistence.UserAccount" table="userAccount"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="administrator" name="administrator" node="administrator" type="java.lang.Boolean"/> + <property access="field" column="langage" name="langage" node="langage" type="text"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <bag embed-xml="false" inverse="true" lazy="true" name="favoriteList" node="favoriteList"> + <key column="owner"/> + <one-to-many class="org.chorem.pollen.business.persistence.PersonListImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="pollAccount" node="pollAccount"> + <key column="userAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VoteCountingImpl" table="voteCounting" node="org.chorem.pollen.business.persistence.VoteCountingImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteCounting" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VoteCountingImpl" node="org.chorem.pollen.business.persistence.VoteCountingImpl" proxy="org.chorem.pollen.business.persistence.VoteCounting" table="voteCounting"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VoteImpl" table="vote" node="org.chorem.pollen.business.persistence.VoteImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Vote" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="weight" type="double" access="field" column="weight" node="weight"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <bag name="choiceVoteToChoice" inverse="true" lazy="true" cascade="all,delete-orphan" node="choiceVoteToChoice" embed-xml="false"> - <key column="vote"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="pollAccount" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" node="pollAccount/@topiaId" embed-xml="false"/> - <many-to-one name="votingList" class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" node="votingList/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VoteImpl" node="org.chorem.pollen.business.persistence.VoteImpl" proxy="org.chorem.pollen.business.persistence.Vote" table="vote"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="weight" name="weight" node="weight" type="double"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="choiceVoteToChoice" node="choiceVoteToChoice"> + <key column="vote"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" embed-xml="false" name="pollAccount" node="pollAccount/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" embed-xml="false" name="votingList" node="votingList/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" table="voteToChoice" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteToChoice" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="voteValue" type="int" access="field" column="voteValue" node="voteValue"/> - <many-to-one name="vote" class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" node="vote/@topiaId" embed-xml="false" /> - <many-to-one name="choice" class="org.chorem.pollen.business.persistence.ChoiceImpl" column="choice" node="choice/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" proxy="org.chorem.pollen.business.persistence.VoteToChoice" table="voteToChoice"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="voteValue" name="voteValue" node="voteValue" type="int"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" embed-xml="false" name="vote" node="vote/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.ChoiceImpl" column="choice" embed-xml="false" name="choice" node="choice/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/0/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VotingListImpl" table="votingList" node="org.chorem.pollen.business.persistence.VotingListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VotingList" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="weight" type="double" access="field" column="weight" node="weight"/> - <bag name="pollAccountPersonToList" inverse="true" lazy="true" cascade="all,delete-orphan" node="pollAccountPersonToList" embed-xml="false"> - <key column="votingList"/> - <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="vote" class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" node="vote/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VotingListImpl" node="org.chorem.pollen.business.persistence.VotingListImpl" proxy="org.chorem.pollen.business.persistence.VotingList" table="votingList"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="weight" name="weight" node="weight" type="double"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="pollAccountPersonToList" node="pollAccountPersonToList"> + <key column="votingList"/> + <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" embed-xml="false" name="vote" node="vote/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.ChoiceImpl" table="choice" node="org.chorem.pollen.business.persistence.ChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Choice" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="description" type="text" access="field" column="description" node="description"/> - <property name="validate" type="java.lang.Boolean" access="field" column="validate" node="validate"/> - <bag name="voteVoteToChoice" inverse="true" lazy="true" cascade="all,delete-orphan" node="voteVoteToChoice" embed-xml="false"> - <key column="choice"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.ChoiceImpl" node="org.chorem.pollen.business.persistence.ChoiceImpl" proxy="org.chorem.pollen.business.persistence.Choice" table="choice"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="description" name="description" node="description" type="text"/> + <property access="field" column="validate" name="validate" node="validate" type="java.lang.Boolean"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="voteVoteToChoice" node="voteVoteToChoice"> + <key column="choice"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ChoiceTypeImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" table="choiceType" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.ChoiceType" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.ChoiceTypeImpl" node="org.chorem.pollen.business.persistence.ChoiceTypeImpl" proxy="org.chorem.pollen.business.persistence.ChoiceType" table="choiceType"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/CommentImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.CommentImpl" table="comment" node="org.chorem.pollen.business.persistence.CommentImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Comment" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="text" type="text" access="field" column="text" node="text"/> - <property name="postDate" type="java.util.Date" access="field" column="postDate" node="postDate"/> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="pollAccount" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" node="pollAccount/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.CommentImpl" node="org.chorem.pollen.business.persistence.CommentImpl" proxy="org.chorem.pollen.business.persistence.Comment" table="comment"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="text" name="text" node="text" type="text"/> + <property access="field" column="postDate" name="postDate" node="postDate" type="java.util.Date"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" embed-xml="false" name="pollAccount" node="pollAccount/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonListImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PersonListImpl" table="personList" node="org.chorem.pollen.business.persistence.PersonListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonList" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <many-to-one name="owner" class="org.chorem.pollen.business.persistence.UserAccountImpl" column="owner" node="owner/@topiaId" embed-xml="false"/> - <bag name="pollAccount" inverse="true" lazy="true" node="pollAccount" embed-xml="false"> - <key column="personList"/> - <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PersonListImpl" node="org.chorem.pollen.business.persistence.PersonListImpl" proxy="org.chorem.pollen.business.persistence.PersonList" table="personList"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <many-to-one class="org.chorem.pollen.business.persistence.UserAccountImpl" column="owner" embed-xml="false" name="owner" node="owner/@topiaId"/> + <bag embed-xml="false" inverse="true" lazy="true" name="pollAccount" node="pollAccount"> + <key column="personList"/> + <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PersonToListImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PersonToListImpl" table="personToList" node="org.chorem.pollen.business.persistence.PersonToListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PersonToList" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="weight" type="java.lang.Double" access="field" column="weight" node="weight"/> - <property name="hasVoted" type="java.lang.Boolean" access="field" column="hasVoted" node="hasVoted"/> - <many-to-one name="votingList" class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" node="votingList/@topiaId" embed-xml="false" /> - <many-to-one name="pollAccount" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" node="pollAccount/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PersonToListImpl" node="org.chorem.pollen.business.persistence.PersonToListImpl" proxy="org.chorem.pollen.business.persistence.PersonToList" table="personToList"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="weight" name="weight" node="weight" type="java.lang.Double"/> + <property access="field" column="hasVoted" name="hasVoted" node="hasVoted" type="java.lang.Boolean"/> + <many-to-one class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" embed-xml="false" name="votingList" node="votingList/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" embed-xml="false" name="pollAccount" node="pollAccount/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollAccountImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,30 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PollAccountImpl" table="pollAccount" node="org.chorem.pollen.business.persistence.PollAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollAccount" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="accountId" type="text" access="field" column="accountId" node="accountId"/> - <property name="votingId" type="text" access="field" column="votingId" node="votingId"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <bag name="votingListPersonToList" inverse="true" lazy="true" cascade="all,delete-orphan" node="votingListPersonToList" embed-xml="false"> - <key column="pollAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="pollsCreated" inverse="true" lazy="true" node="pollsCreated" embed-xml="false"> - <key column="creator"/> - <one-to-many class="org.chorem.pollen.business.persistence.PollImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="comment" inverse="true" lazy="true" node="comment" embed-xml="false"> - <key column="pollAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="vote" inverse="true" lazy="true" node="vote" embed-xml="false"> - <key column="pollAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="personList" class="org.chorem.pollen.business.persistence.PersonListImpl" column="personList" node="personList/@topiaId" embed-xml="false"/> - <many-to-one name="userAccount" class="org.chorem.pollen.business.persistence.UserAccountImpl" column="userAccount" node="userAccount/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PollAccountImpl" node="org.chorem.pollen.business.persistence.PollAccountImpl" proxy="org.chorem.pollen.business.persistence.PollAccount" table="pollAccount"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="accountId" name="accountId" node="accountId" type="text"/> + <property access="field" column="votingId" name="votingId" node="votingId" type="text"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="votingListPersonToList" node="votingListPersonToList"> + <key column="pollAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="pollsCreated" node="pollsCreated"> + <key column="creator"/> + <one-to-many class="org.chorem.pollen.business.persistence.PollImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="comment" node="comment"> + <key column="pollAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="vote" node="vote"> + <key column="pollAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PersonListImpl" column="personList" embed-xml="false" name="personList" node="personList/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.UserAccountImpl" column="userAccount" embed-xml="false" name="userAccount" node="userAccount/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,50 +1,50 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PollImpl" table="poll" node="org.chorem.pollen.business.persistence.PollImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Poll" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="pollId" type="text" access="field" column="pollId" node="pollId"/> - <property name="title" type="text" access="field" column="title" node="title"/> - <property name="description" type="text" access="field" column="description" node="description"/> - <property name="beginChoiceDate" type="java.util.Date" access="field" column="beginChoiceDate" node="beginChoiceDate"/> - <property name="beginDate" type="java.util.Date" access="field" column="beginDate" node="beginDate"/> - <property name="endDate" type="java.util.Date" access="field" column="endDate" node="endDate"/> - <property name="maxChoiceNb" type="java.lang.Integer" access="field" column="maxChoiceNb" node="maxChoiceNb"/> - <property name="closed" type="java.lang.Boolean" access="field" column="closed" node="closed"/> - <property name="choiceAddAllowed" type="java.lang.Boolean" access="field" column="choiceAddAllowed" node="choiceAddAllowed"/> - <property name="anonymousVoteAllowed" type="java.lang.Boolean" access="field" column="anonymousVoteAllowed" node="anonymousVoteAllowed"/> - <property name="anonymous" type="java.lang.Boolean" access="field" column="anonymous" node="anonymous"/> - <property name="publicResults" type="java.lang.Boolean" access="field" column="publicResults" node="publicResults"/> - <property name="continuousResults" type="java.lang.Boolean" access="field" column="continuousResults" node="continuousResults"/> - <bag name="vote" inverse="true" lazy="true" cascade="all,delete-orphan" node="vote" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="choice" inverse="true" lazy="true" cascade="all,delete-orphan" node="choice" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.ChoiceImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="result" inverse="true" lazy="true" cascade="all,delete-orphan" node="result" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.ResultImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="creator" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="creator" node="creator/@topiaId" embed-xml="false"/> - <bag name="comment" inverse="true" lazy="true" cascade="all,delete-orphan" node="comment" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="preventRule" inverse="true" lazy="true" cascade="all,delete-orphan" node="preventRule" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.PreventRuleImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="votingList" inverse="true" lazy="true" cascade="all,delete-orphan" node="votingList" embed-xml="false"> - <key column="poll"/> - <one-to-many class="org.chorem.pollen.business.persistence.VotingListImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="pollType" class="org.chorem.pollen.business.persistence.PollTypeImpl" column="pollType" node="pollType/@topiaId" embed-xml="false"/> - <many-to-one name="choiceType" class="org.chorem.pollen.business.persistence.ChoiceTypeImpl" column="choiceType" node="choiceType/@topiaId" embed-xml="false"/> - <many-to-one name="voteCounting" class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" node="voteCounting/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PollImpl" node="org.chorem.pollen.business.persistence.PollImpl" proxy="org.chorem.pollen.business.persistence.Poll" table="poll"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="pollId" name="pollId" node="pollId" type="text"/> + <property access="field" column="title" name="title" node="title" type="text"/> + <property access="field" column="description" name="description" node="description" type="text"/> + <property access="field" column="beginChoiceDate" name="beginChoiceDate" node="beginChoiceDate" type="java.util.Date"/> + <property access="field" column="beginDate" name="beginDate" node="beginDate" type="java.util.Date"/> + <property access="field" column="endDate" name="endDate" node="endDate" type="java.util.Date"/> + <property access="field" column="maxChoiceNb" name="maxChoiceNb" node="maxChoiceNb" type="java.lang.Integer"/> + <property access="field" column="closed" name="closed" node="closed" type="java.lang.Boolean"/> + <property access="field" column="choiceAddAllowed" name="choiceAddAllowed" node="choiceAddAllowed" type="java.lang.Boolean"/> + <property access="field" column="anonymousVoteAllowed" name="anonymousVoteAllowed" node="anonymousVoteAllowed" type="java.lang.Boolean"/> + <property access="field" column="anonymous" name="anonymous" node="anonymous" type="java.lang.Boolean"/> + <property access="field" column="publicResults" name="publicResults" node="publicResults" type="java.lang.Boolean"/> + <property access="field" column="continuousResults" name="continuousResults" node="continuousResults" type="java.lang.Boolean"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="vote" node="vote"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="choice" node="choice"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.ChoiceImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="result" node="result"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.ResultImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="creator" embed-xml="false" name="creator" node="creator/@topiaId"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="comment" node="comment"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.CommentImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="preventRule" node="preventRule"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.PreventRuleImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="votingList" node="votingList"> + <key column="poll"/> + <one-to-many class="org.chorem.pollen.business.persistence.VotingListImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollTypeImpl" column="pollType" embed-xml="false" name="pollType" node="pollType/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.ChoiceTypeImpl" column="choiceType" embed-xml="false" name="choiceType" node="choiceType/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" embed-xml="false" name="voteCounting" node="voteCounting/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PollTypeImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PollTypeImpl" table="pollType" node="org.chorem.pollen.business.persistence.PollTypeImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PollType" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PollTypeImpl" node="org.chorem.pollen.business.persistence.PollTypeImpl" proxy="org.chorem.pollen.business.persistence.PollType" table="pollType"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/PreventRuleImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.PreventRuleImpl" table="preventRule" node="org.chorem.pollen.business.persistence.PreventRuleImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.PreventRule" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="scope" type="text" access="field" column="scope" node="scope"/> - <property name="sensibility" type="java.lang.Integer" access="field" column="sensibility" node="sensibility"/> - <property name="repeated" type="java.lang.Boolean" access="field" column="repeated" node="repeated"/> - <property name="active" type="java.lang.Boolean" access="field" column="active" node="active"/> - <property name="oneTime" type="java.lang.Boolean" access="field" column="oneTime" node="oneTime"/> - <property name="method" type="text" access="field" column="method" node="method"/> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.PreventRuleImpl" node="org.chorem.pollen.business.persistence.PreventRuleImpl" proxy="org.chorem.pollen.business.persistence.PreventRule" table="preventRule"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="scope" name="scope" node="scope" type="text"/> + <property access="field" column="sensibility" name="sensibility" node="sensibility" type="java.lang.Integer"/> + <property access="field" column="repeated" name="repeated" node="repeated" type="java.lang.Boolean"/> + <property access="field" column="active" name="active" node="active" type="java.lang.Boolean"/> + <property access="field" column="oneTime" name="oneTime" node="oneTime" type="java.lang.Boolean"/> + <property access="field" column="method" name="method" node="method" type="text"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/ResultImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.ResultImpl" table="result" node="org.chorem.pollen.business.persistence.ResultImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Result" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="ResultValue" type="text" access="field" column="resultValue" node="ResultValue"/> - <property name="byGroup" type="java.lang.Boolean" access="field" column="byGroup" node="byGroup"/> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="voteCounting" class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" node="voteCounting/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.ResultImpl" node="org.chorem.pollen.business.persistence.ResultImpl" proxy="org.chorem.pollen.business.persistence.Result" table="result"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="resultValue" name="ResultValue" node="ResultValue" type="text"/> + <property access="field" column="byGroup" name="byGroup" node="byGroup" type="java.lang.Boolean"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteCountingImpl" column="voteCounting" embed-xml="false" name="voteCounting" node="voteCounting/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/UserAccountImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.UserAccountImpl" table="userAccount" node="org.chorem.pollen.business.persistence.UserAccountImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.UserAccount" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="login" type="text" access="field" column="login" node="login"/> - <property name="password" type="text" access="field" column="password" node="password"/> - <property name="firstName" type="text" access="field" column="firstName" node="firstName"/> - <property name="lastName" type="text" access="field" column="lastName" node="lastName"/> - <property name="administrator" type="java.lang.Boolean" access="field" column="administrator" node="administrator"/> - <property name="language" type="text" access="field" column="language" node="language"/> - <property name="email" type="text" access="field" column="email" node="email"/> - <bag name="favoriteList" inverse="true" lazy="true" node="favoriteList" embed-xml="false"> - <key column="owner"/> - <one-to-many class="org.chorem.pollen.business.persistence.PersonListImpl" node="topiaId" embed-xml="false"/> - </bag> - <bag name="pollAccount" inverse="true" lazy="true" node="pollAccount" embed-xml="false"> - <key column="userAccount"/> - <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" node="topiaId" embed-xml="false"/> - </bag> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.UserAccountImpl" node="org.chorem.pollen.business.persistence.UserAccountImpl" proxy="org.chorem.pollen.business.persistence.UserAccount" table="userAccount"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="login" name="login" node="login" type="text"/> + <property access="field" column="password" name="password" node="password" type="text"/> + <property access="field" column="firstName" name="firstName" node="firstName" type="text"/> + <property access="field" column="lastName" name="lastName" node="lastName" type="text"/> + <property access="field" column="administrator" name="administrator" node="administrator" type="java.lang.Boolean"/> + <property access="field" column="language" name="language" node="language" type="text"/> + <property access="field" column="email" name="email" node="email" type="text"/> + <bag embed-xml="false" inverse="true" lazy="true" name="favoriteList" node="favoriteList"> + <key column="owner"/> + <one-to-many class="org.chorem.pollen.business.persistence.PersonListImpl" embed-xml="false" node="topiaId"/> + </bag> + <bag embed-xml="false" inverse="true" lazy="true" name="pollAccount" node="pollAccount"> + <key column="userAccount"/> + <one-to-many class="org.chorem.pollen.business.persistence.PollAccountImpl" embed-xml="false" node="topiaId"/> + </bag> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteCountingImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VoteCountingImpl" table="voteCounting" node="org.chorem.pollen.business.persistence.VoteCountingImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteCounting" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VoteCountingImpl" node="org.chorem.pollen.business.persistence.VoteCountingImpl" proxy="org.chorem.pollen.business.persistence.VoteCounting" table="voteCounting"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VoteImpl" table="vote" node="org.chorem.pollen.business.persistence.VoteImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.Vote" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="weight" type="java.lang.Double" access="field" column="weight" node="weight"/> - <property name="comment" type="text" access="field" column="comment" node="comment"/> - <property name="anonymous" type="java.lang.Boolean" access="field" column="anonymous" node="anonymous"/> - <bag name="choiceVoteToChoice" inverse="true" lazy="true" cascade="all,delete-orphan" node="choiceVoteToChoice" embed-xml="false"> - <key column="vote"/> - <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="pollAccount" class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" node="pollAccount/@topiaId" embed-xml="false"/> - <many-to-one name="votingList" class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" node="votingList/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VoteImpl" node="org.chorem.pollen.business.persistence.VoteImpl" proxy="org.chorem.pollen.business.persistence.Vote" table="vote"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="weight" name="weight" node="weight" type="java.lang.Double"/> + <property access="field" column="comment" name="comment" node="comment" type="text"/> + <property access="field" column="anonymous" name="anonymous" node="anonymous" type="java.lang.Boolean"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="choiceVoteToChoice" node="choiceVoteToChoice"> + <key column="vote"/> + <one-to-many class="org.chorem.pollen.business.persistence.VoteToChoiceImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.PollAccountImpl" column="pollAccount" embed-xml="false" name="pollAccount" node="pollAccount/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VotingListImpl" column="votingList" embed-xml="false" name="votingList" node="votingList/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VoteToChoiceImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" table="voteToChoice" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VoteToChoice" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="voteValue" type="java.lang.Integer" access="field" column="voteValue" node="voteValue"/> - <many-to-one name="vote" class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" node="vote/@topiaId" embed-xml="false" /> - <many-to-one name="choice" class="org.chorem.pollen.business.persistence.ChoiceImpl" column="choice" node="choice/@topiaId" embed-xml="false" /> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VoteToChoiceImpl" node="org.chorem.pollen.business.persistence.VoteToChoiceImpl" proxy="org.chorem.pollen.business.persistence.VoteToChoice" table="voteToChoice"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="voteValue" name="voteValue" node="voteValue" type="java.lang.Integer"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" embed-xml="false" name="vote" node="vote/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.ChoiceImpl" column="choice" embed-xml="false" name="choice" node="choice/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml =================================================================== --- trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/resources/oldmappings/pollen/1.1/org/chorem/pollen/business/persistence/VotingListImpl.hbm.xml 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping default-access="field" auto-import="true" package="org.chorem.pollen.business.persistence"> - <class name="org.chorem.pollen.business.persistence.VotingListImpl" table="votingList" node="org.chorem.pollen.business.persistence.VotingListImpl" abstract="false" proxy="org.chorem.pollen.business.persistence.VotingList" > - <id name="topiaId" type="string" length="255" node="@topiaId"/> - <version name="topiaVersion" type="long" node="@topiaVersion"/> - <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> - <property name="name" type="text" access="field" column="name" node="name"/> - <property name="weight" type="java.lang.Double" access="field" column="weight" node="weight"/> - <bag name="pollAccountPersonToList" inverse="true" lazy="true" cascade="all,delete-orphan" node="pollAccountPersonToList" embed-xml="false"> - <key column="votingList"/> - <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" node="topiaId" embed-xml="false"/> - </bag> - <many-to-one name="poll" class="org.chorem.pollen.business.persistence.PollImpl" column="poll" node="poll/@topiaId" embed-xml="false"/> - <many-to-one name="vote" class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" node="vote/@topiaId" embed-xml="false"/> - </class> +<hibernate-mapping auto-import="true" default-access="field" package="org.chorem.pollen.business.persistence"> + <class abstract="false" name="org.chorem.pollen.business.persistence.VotingListImpl" node="org.chorem.pollen.business.persistence.VotingListImpl" proxy="org.chorem.pollen.business.persistence.VotingList" table="votingList"> + <id length="255" name="topiaId" node="@topiaId" type="string"/> + <version name="topiaVersion" node="@topiaVersion" type="long"/> + <property name="topiaCreateDate" node="@topiaCreateDate" type="date"/> + <property access="field" column="name" name="name" node="name" type="text"/> + <property access="field" column="weight" name="weight" node="weight" type="java.lang.Double"/> + <bag cascade="all,delete-orphan" embed-xml="false" inverse="true" lazy="true" name="pollAccountPersonToList" node="pollAccountPersonToList"> + <key column="votingList"/> + <one-to-many class="org.chorem.pollen.business.persistence.PersonToListImpl" embed-xml="false" node="topiaId"/> + </bag> + <many-to-one class="org.chorem.pollen.business.persistence.PollImpl" column="poll" embed-xml="false" name="poll" node="poll/@topiaId"/> + <many-to-one class="org.chorem.pollen.business.persistence.VoteImpl" column="vote" embed-xml="false" name="vote" node="vote/@topiaId"/> + </class> </hibernate-mapping> Modified: trunk/pollen-business/src/main/xmi/pollen.zargo =================================================================== --- trunk/pollen-business/src/main/xmi/pollen.zargo 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/main/xmi/pollen.zargo 2010-02-22 21:16:44 UTC (rev 2876) @@ -1,97 +1,109 @@ -PKZ�P;pollen.argo}Tˎ�0��W >�LFU�a�tѪUG�v9pW�1�4�����v2$�����uMe/��B1n��e�Tu'Z�a�T[�!�FB��CSW����)�����C�晼|!���ڞ�@���(<Q�0�M�V�5�� +PK�V<pollen.argo}Tˎ�0��W >�LFU�a�tѪUG�v9pW�1�4�����v2$�����uMe/��B1n��e�Tu'Z�a�T[�!�FB��CSW����)�����C�晼|!���ڞ�@���(<Q�0�M�V�5�� �F�9F����??��@ �|�sը�D����A/4 -z��
z�`�H�-.�-M�{G�S3*<"C}II�(�i��7��rQ#e3eRy�G�$�Rcޑ�R}���y�A��h�+����aT&U`����z�N��j��8���C�qw���
;8b�Z7j�J!D{���y�^v`o;(��Z��+����s����vaF87�1ۜ[f3��C�Kʛ���*����eIJ(�Z���&��b�pږ�o����>쿽�E�h8����[�K`[ڹ��Av��PK-��\��筟�� �}���s�A��^z�2�u�RȞ��pF�X������|��b��wc�N���]�>�5������u/tB�L��O�������̎ۖ�<�PKptB�PKZ�P;pollen_DC_Pollen.pgml�]mo�F���_�k\�(�pH����, -�ݠM,��,ю�ʒ!�Isq�R29�9�!9!�E��Dʞg�9|漾�����x�[n�o.�K�b���r}��������䯗߽��������&���������w?O.�^.��~E��"�ͷ��}�m������~��/J�Y,g������~�_����o����m��i�����Y�v���k�o��t�S�O�����s�f���H����W���W������w����=�o.�����f����]�^�o7O����/��O������?�ً ���y!����8��c�[ޮ�7w��.�a����f��1�cy���y������/���0���ۧ}\|;�{?m�7��tsM�o�[�V|�?�7����ŗO�}�}����O,^zx�x��j6�O��e�������l�����m<�����Xؐ�ٖ�����ǯo.8��?}Y.���^��Χxy�i�ܓ}�����=��+�!/k2���Y�^� -�An~�da���+U -�%|��-W7]���Ɨcty�����E�LP.� Ȣ � A�����5K.[q&|1���}qH^G �����u�g��3Y�d����'w�5�+�}^m��w���j9s�ڶ����j���|�n�� �8��v���r>;(�M��J����_V������׿���?��O��ٰ��x�A�?�E�1����g_`ۖ�c -! -��a�A�2y6^�盧���b��i�����f��8���o?�9�G3�}�̜��ה�#Uf�cdf�p�!7s �)�C�m5��݂6�6�p�w�\�S��l�Z���̮y����7�6Hۑ���Y-���F������L��r�4��ʈ��r�����CU9Z�,�}ԩ�ߩ�с�\�uU�x��rE�/q�@@T�WB�h�u�p���������Ï�ɫ�o���E
�M*�"�hD;E��f��6�;Re;D*� -��a�\�H��c&N[^���*�Q��� 3�|�m��~1a�s�'�#���r�p�'�$���4qlei�"MQc������DȪOL$N���#�%+�$n���#DZG�x*�>��>1$�Ċ�$߉rc�w���xk�C�}b���g3G�Sf��:|b�����9�����>1q��(=����c���K���?3<T�S�b2���0H-ԓb�J�;�X��%�QW��h�b��)�Z� b�n���k3 -b2�
Ru�,D��g�ݗ���#����v����w��n�G�n_w�A�MG��W��h� -�!
�F��g���z�����!��lV�l]�yP�9�$��OR _�?��kHxX�6U%|h�>#�����t{
�����^Lh�K�Q��+b��3��w*����� Kԗe ���gY�e��p�ΐ�j4�xXt:���h� � @��F0+�*��tj,#�t�1��"��e�B,C2$��I�CIz�.����0R�b�ٶY�a�o���b%�!�?k�[�1ܷFa��(�bꥷG0��ƁLD�Q��D�oI����&"5~
*�2��-~Q�p�v�T��-��V��8^��%��.9g0�0�J�BF�G��+�1CD�Sޕ��+�h�v��HO�,�9޾o -�u�hCR�o������f9���G8�<��Jęq�#0��D��`�b��u -u�^�
:� -�� T�>@�f��/�����>�Vi
g`�y����W�]�0�}�����Hg�t�NE�j��Z�6_��.;�%ء�s��'��֛�ׇ����>>
z�ɒ
�g�G�/B_o���1@��(�)ޏO����wO�}-��GM%ೱD7�|��r�ą���GNA�9��HC���r큳2�R\ld%������3\�0|1�4�̓��P�l��[�h�.)d�pDEY��$KB6`f9QT���3\��Y�,f��E�L�.Q2\1��"1���d��a$-C��ax�3\R�5.���"��r���g���vD�i�����y.��� =Z8���pmE݉��"[8���Il�Awҷ,��.H�Qt�D�^z�q����r apT7��hO��$�P�@�H��y��Lu�Y�K��%�QS݊�hs\���J�J/���u�6.�#J�����~�P/:Ċ�/��o��kn-)�cl������?K��� /e��]��e�?�j�1L�� I%�,�o�䏡v�1�٤ObZ���Z鏁:Z��E�ch�?�
G��ƣ?&E\㏡S*�C�ẇx�۬��1�
�YGg�s��k�H+�1|�f�K�?&ٍ���-���C�ǰ��h��V�a@ё��6+�9*S7f^sD+�1̰�h�~�RL���j�������֡�I��6�e -bv��6�:��s�����v�l���[��5�ŏ�y�����f{�'w�d����G�^%��7�o�}��K@��_�Ľr�T���?�����'6���o6�N��}�"��˿n�eo�m��J5�ۛ��c�_qw���SX�:д� �~Z헏ܐ�_���TO�o|܁q8N�.�w���z��-XW{@�o
�{Չ-hQ��W�lw�Q�;��=@42���ҒNG�A�/<�a:s�����+�#���f���m����b&� -�.�O���~��^L�a�tr�f� -���O�Ļ -�M�/"�b1�!�{w��^�ALj='�����^ �i�yE�m<�,v�+�&t�f;b@۹�!�z@N.�J[:�
1���t�Rr1ԭ
�
1��hB�������G�U8����u�����hר�V�v�-_4:�,�����5�a�+ַ���q3ʆw0����b�a���%�=�Qӂaj��j���@�Ҵ�SM�YЧDӒͨ�i�[�1���daL�=?�
M�0C���g�k�>c@��"�
T���b$�3��š���g2�]<\��h/��?��F3�2����؎e��X&��2�x��A�|VD��;�Y,��U^�E2��E2����v�q̠�qL�;`;��/�Y��[�T3�w�� Rs�
���&�M=�����e�%x�Q�2'���4ri�ܽ�M�mr畓;�#w����G���Β��,nuƂu�:K�:���;`�h��2�����F��OeF�RwW ^�o���F��J��-��'c����Lcx���]�:�C�Wߤ�%hYvH�ˍ�]�(R�ݥ�N�x�D^�4�b^�42��$��� ��TzZTHOK�$��fA� )ʻ����YKPS�^�Z��8��))j�Ȃ��Ij�����A�u���٨Ǐ�LS� -ij�) 2�(7%}OT;�*���jV�MW;X9J£���!+�VM�$�)V� �Y9��y{�4Q�R֊� mGY* -*k�W��8k-���v�QtT8 -R��5�VD@�88#5�R�z��V�p�v�U��=��HI^S-���L���Ӫ4� -A�I�h>��S�i��j*��T�Sr����˪�ղu��7�\�r.{�
8�.�쮣�����s�AX������¿��I�l-�0k��Vz/&
Kg��.���) ��NE=���f���g��u�I�P�K�!�Y��θ�#��n�Y��"T����-w�M�*zAdQ��� -7a�$�I�����n�r����/� %c�fc�w7!?/&gE����h�E�������ÚB�L\[.�� -B�V!�;,�K��+�Ea��(qY�Ds����cj�Gx�8/8j��E�o������yPa@�t����y������8� -yPI�����0Ө�2������hX��~�������Ћ�A����9@ -����˭�����X���;�d�`�ڳ6jS5v69��.�����j�����jv���4� ����^��w5+�b3M��`�0��- -u�^�E�xW�;��M�\����8�4�2��T}&:����q�U���bm�=�4���d��d�dϠ}�}�GF��>�`��##٫� �����@#���=2����`����^Bu�!+!{��B���}�\O�ƕ��fl��j�d��A�N�p2W+?���,�VRWqD5+$�rde74V�TYە��ތjY��U~��zJ�:��Ii� @��HJ�:��I��~`�$yL�:!��8�Z2%�2�Z5%}O����?�}Zi� �c�S# z4r� -?-��RL�)ղ����:#�e�'�ݘjVR��lGY�IT2ٺp�yR��9թ�1��-�V��m雒�%��j� }��L��ݜ�2}K����oѧt���UyU������n���9]T�钑&P������+΀9�?r�vo��zġ�q4�4��o�E�����p�z��?c�
��|��\2'ƚ鱆|�h�_��ެ�ˇZhz�#@�
�=�z��x�i����鸴��k��b:n�YgwS�~R��g�����_fr��#�Et;cs~�#aһ����\u��w��[���#(j׹L��4I�yw�o͝.�N?o�]w���+��^�(��t���+����s�8���Ṯt��J��H^�^nF��JO�|�T���HZ����Pr�p�s�µ���?�l�8:f�J��U���7?:��;ێ���Δ[���]?�A׼!��CWt��6t�g>�R]���W�k+�}�<@�r�$��Ϝ3�1[=Ű_��G�|6w-�rA����<l��C��/���C��/��('��R�zb)A�%J���%����$�[ETsN�6�R��'�SN���-�}bƸ$����O�ȟ3�o�Un{�rTG-�|�y�Y���"��-CaQh�wT�U�U�}���;��YE���X,8TE�gU�8�(E�:��76 -�Ϊr��*(8�$S)?TS2g��I�uR�֍�hݪ>[�n���Q%[7�gȺu����QU�i;J�>S*ف[�U�]G�A�Pt�7��&;�}C@C]H��n��gΪR}C��>J� -��Hq�zy�*����W�9)�D5
��ޘ��b=?tZ6L� -�dOl���4D'�l�Y}�<�N������6-:as!8����XV�HG�9�X&�Vp�fϢg��7W���S���)[{U�͍5s ���sV?�f���%t��N+��q� -\Bg;�.����n�b���s��i��k�Ꞡ�]� -}[t
����&b�4�
MV�$Pc��ˁ�s:�2���7�J�\v�,�̿Ro��F
\>�?�l�>��}��7�C�"gI_���gn��j�sb�,�;�u����9��,���['ڑ����Wmg�3��Y�׾�W�?5��M�_�:��Q=:^^�� ��t�K�����Farರ�fA�Y o��"�Ӷ�.�s��ac�Wt��mU^��9�x��\MЫ���Ǽ�t�>�F�ST���z�����8�=�s����{��9xfI�0��%�c��iX��x�]�������^L�C��$猰�Zt���i�J0*�����h��yn��܃�R�F�ztH�Sڣ���v��!�R.�����RɁu�:�&��
����v�u��8��&E;��V�H��~�w���*8�v�s$ƍ3��h�qź���� Za�|��6��D�t!�J�.샼em0�zW�Ǹ�j�G�A���±!*�ҥCQ8��5�p�[��Y�C�•��.W8�f�)��J$�n�X��!&�'@�e�H� -��n�F$��P(�sWS�i�`�k��d��_�s����B΋����NwA��Nr�D�S��i��ʨw��
�M��Ȃ�:lz�A�|���o;��?��uYp�1jj����)v=jJՃnB��((�Jɑ=�j�f�BP���0�M��7tdϏ��6��T��������칹u+�I�!�<ȝ��΅��B�qχ���^n��h$�"�y�V��$j<S�r(� ��3��$DZ0�
��������,�$wqSMH߃�I���W-�Z6�!�Լ1r0oP/�n�[k��4e���Fn�y벏[��~EW�T�l7J�+��Q��<�I,3SU#рUM eʪF�n�Z��e�FJ[���1n����@Ub E1��)�bVyH1�s�q��O.u�|,'�Y&�M�@xp�)@5N
����<Y�P>L�-����eǖW@2����^
�"��[�� -�J�&�P���+P�+@5^
�"TmH߽� �����h>����F�+ƭ�� -�� @�[ȸ���~P�C� $�QzP
rV�[�}�
�@�!��U�`���6�@��AX�j�3S�>��A8���9>
�� �t�k�)�?�m�}�����y�6r�t1)dq�0��vާ�׺V���`uf��y��l��j.���eާ9����>���}���zާ�˼Osȁ�8���>���}���vާ�zާϔb�tJSY���x𓯧���_|��i��望f���T��Ol73l��望v�l���ʤ]bh:��>@� -�Nٰ �u��Hk�o�2� �.��5�f
��P�܌�忴3>w�� --�9r�˞Zf:��]�����`�l�hy#�nߛ�d����\0p2W]8o��#����m2|�d��%���r������sg[ s7�>��ղ���lM:��<���܍���>�swq+϶��5F��B�����t�݁��|u<�>�sw -q�"_��m:��X��,�0��Ƴ��a�Gi�9v5�W����Xs�:��\T]��#LZT<9��?�&xF�%��V�e�SQ�w�V�^�UV� "�n�^TY��ӱZ��j�HS�糱Z�3�Ue�^�@�C�`�p�ik��(������6�!�^@ -�V/ٍ�D�[�k��j���Xժj�8:߂� -�V/ٍ��V�E_�U����X��@�^���;�(�^�ɷ�v4�_��]E��%�Q\����R�iy0H[�GŻޟ\�Gz8���mU^�łH?�ڛ���\{����6��M6��gʓ~N�7F�]�ڤ���m�o9D��lEU����;�3�z�֬���Y&t,�Q�f,��E@��vKC�p��=�v^���P���)�����s��t���^���;�� ��������W�� -����;�� �m�\�qG1c��ȁ��'r���N�N�pES�O���,�9�^!�Pt��AB���
���ΕP�қ�T�/T-l��j���h����w��Mz:H��=�N�z4L�d�;��&=����&z��PU敔������x��P��h^'��i���3f�O�N��@�H�:-2Ҽ�{`�摑�Et\ d�y5��6�#�&�K��j�<�r3�WsN^S4調ج���G��@��i�U'!Z:Ҽ�.�t�y5��:ͣ#ͻ�"bKG�Wsl�<�mҼ�,��`E����h���G'KD��l��ir�*x^i^]�ח�G�Wy5G�z4�d��u@�z:��=�N�z4�Tد�����^O�!5�����3�0ST�3�((!z��Iw- -��o�?�.��PK1f��^��
PKZ�P;pollen.todo�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��q�(��;�D�*���+G���*(�8z)%)J -@% ���,.
2���E���9e�)�E�%��� Y,B3PK4�[-m�PKZ�P;pollen_profile.profile�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��qq��e��q��ÙPK7Rp:BPKZ�P; -pollen.xmi�]듣6����•ڪN�^{x?��ٲ�����ܩ�$w� -���3��_�������dD��[�GG��<t��/�����=�(��`���A\38����?�l��������~�}{����C��>����{�I���n�5������ˇY�M��!k�����8�L�f��H��4[o>�I�`>��a6�~o�F�g�����s|�A��������FI�v�Œ���q6��0�!�YF��F~��<�t�?����ʿN���X�?i?�"���Н���������u.J3�x������~:��3H�{�~�
|ϛ�<�Ǭ����?~� -1М�'�r0t�~Vp�����x93��(.�߽?�酅G�0H����2�����:�ͦf�)�a�Eu>i�K���xE�ɺ <�x�� < -��J�^ؗѕ��S��� ����>@��|'T���1̾�#���C�~��Z?^�q
��y��C��aƹEv;���GX4zi���ĸM3�bK�)y�(��f;PbԒ%��������5$�Dh��~yW�u�K��R��&�����9 -7������û%�ˤT�?�ٻ6�����K¿�4���O���]Ω(��2�G�COl�H��ڦ�x"' -��r:������5���␯酝����!�tq��ذ�KK��jo\�9rn�ރ8F��+�|.�� -���nS6]�QQ�{�^?���ʜ�����b�o�{?��}z8�{����W�oŖ�C'�!�Sg&�Y:[������Ayü.��i�j����� �����" -�P�,5뾞��9Ly��Ar��(_&I���� �E1�m�)�+M�i\O��g�ş�l�F����Re �4��q��`��ˋ��k�`R}O�#�ٌ�N�3�ߞx�x:������խX4���OI�Q6غ�d��J�5ų�N�������P�����$��T�5r.ߑMf�@o�s�K�D�˹�@G�T/�$����(�HT�5�Qu�
�w�����_5��N����a��k�a��0p���`@L��]״��d�A6C�\�j��&x{?5M&� �t98�ч����X -��o��z��j=�c��(<���!8�����s:2��MS>�(�/��~�PÔ{4�/&5s�й�&�7�n�E�+�l��.�٧)tdR5ra����]�o��.����0h���e�L�N�VMѵu ���4�pQ\y3��ݞ@|={>��ŜJ��@����=Y�� hqO"�+�I�␇�1Rl$�5�j����C�4�S��xa�ڐxQiӠ�t��Dz
e�������ꄍ~Y��藑��x����˜�����+�� -�Ta������<��Vi�p�'�ߵO��E���Z?`$_B?ˆˋd�a܈�mľ����n�4YT�hz�k� -���"��H����� i��(rz�`rqp��
+��xa�]^W�nb��i)��V��i���Ċ�r�^z���9�R�tn���r���}^���&�fie&/r]�5C������j��#�^���Sɛr�nf���҉��1t���\�;�u8'|:���ܧ"�,(r�8i��C��VhT"ⲇ�}=���Z("7�ʝ��쫴l�����*�&&u4���������{K���t�W��HI#]!H����n�f�^3�kg�N��u���eG����hfY1���ǀ�GQ[k�l�I�䨮+gc:��k(_7�
�Y�m�1��|��)���H��ݕ��0�Rf*{.�bS5q�@@�Rk�d���!���
�a � �M ����.��T�� ���Y� (E�>���$u�X��Z����!9��Y��aJ����DC�
"g}�Az)y��7�t�scl"e.;.;�&;ڙ�2�Gu��`���:2�@1+�=<�� -��1#��t"G�� �Y����� ���y�*�Z#��)6��.,H�ʀ�A��R�DF�Jcs�>e6] b��i`��<�R�;���e[�EGI�%C�4 �t��9!��O�1�.3v���DrGR��=�B��b��=��3�g�ܞ$)��4)�Y߇;�w����hyGJ�pq���H������?���;�&�������X,�� -jj�/��8�8�("��K&"�;�K���,)o8���+tU��R�p���`�@�=:{��'?�3�LF��|�,zED`�6(� � -�2AZ�\]vm�����@�;��pX�
���
���.5���
Y�g��s���$��_r�w?E���d{rU�L*0��3ŏ��>6ƛ�52�'��S��]�F�������xntB|~>[i?9���Q��]€L�R��g��&���K����S����_Qx<p����w �3)����g=�3�M��h�S�S���'�Rk5^-sE� --�1A�SPk�Wi,ugh=]�A��!��+�:ܑ�H(�J��9c
 -����Y��tv) �����`�; -�+�e:n&"�ա؆$�q�Ѡ��!�N8!���c��K��m�R�l��xо�zc,�M4�L�:��4�R�[� -(�ş�3)W��Z���]o�j&��c;)��mL(#=Ijcɛ'�| -�����1/�mM$�wS�����z7�ژ���6~�D��I��x�tH�_Ԅ�ёJl�'�8�:�&+�F��z�����LF��ڞ@^-��a�И���؉�C��9`������.�:�\�5œ%7�E=E���/U-��9G.Ý����-@p���5A9�W�5������X��
�I��psT ƒ�QH�:dU\Rye�R�Jcu\�H�:d�\Ry��R�;����:r5�O������ў.�pբ�P6:��x8�
ƎN'�!5��s�a<�t��U�=��.^�����I]68��t��>[�Xp7>C"��~[����:�\�-
IH�gd�c�U=(5�̍��{�+�'� �<2€�HeP�pG�@$*��d~�ۘ��]A@�*
�A�L��k��lfU�]*.R*T�e�9�8���:��B� �$r8(u�#8(��4UP͖������H�E��� ����R@ -wc(1w��L�QB��݁Av�4�j����4+�ƨغg���^��}C���hD������U�kq4%�Zf%���� -�8~�c~�)��}V�=��� -l~�tGk{����%��//ĹlȎd)��@苾�Jp{���)�;.,hŜϵtʵt�MIr�?DC�
�3\6��F����b��QY�Hnh�:�&8Z�F��_�EE�g��u��I�L��@��� -﷧��.�:L�밌���O���C�x�5Ir�x��8�cEU�h�U��f]�s�A��u���x����'�J-�#x�wP�j[tD�D.��`��9�߲�3��Epw~g -p�ҵ;���ysx�/&����c�$j� J�$d�]�o�5�0y��aGc�����O �WB�� X�Q���vѦ���9�`��%�6�:K�ek��.��߹��7)uC�qDCGnu��5 -�׮� �R��O؀ݢ��+���� -gz�k���ym�4@R"U�l.���I�J4�oD����4�C3J6Z�Y��5��������A��V�L�8�΁�Q~?��;þ7"� ������#«�h:��>^B�� -�M�'�����9���{?� Aƻ���vI]�I��ʽ�v�z�{&�o��GJjnNw�*�7���+n�a�)n��@F^p��k����O�����~{�L>�5�����Ɔ����փ��1�z����6e�MG��6��v��1�,�D"o�)��Mֽv�{��WMѵu ��}O��E]�Sm�BV�u�L;�Kk -�剎�9����� -EE�M�AgA6FT�z ��܎U��5����,f��Z/�HX��?�Js}I�E�B�eIҡ���ضj����b�\T`�s����ȋ��:LQT��l��Y�e0��%:2���~�w�h -N -��+��-!��ZRI�R֩�kIU�4UU�C�,���H���,�i�'E�E�I�|��͖��2w��-�y1<(�Wǘ��Ʈ0r7 ��KmLk�X�X����5ZlX@�)n�!:Y� -WO�)������dr-����w�����9���ګk�e!J�P�N\A+��0%�����,��kpթ˂���EiU���p2*�SƏ,z Sg!�Pǯ�5Y���
�z�h��Fd!��T<-&��5�)�G�ڤ�O�~ϣ�Y�Rn=ߍ׋�(el~�ts|{���<J����g�f��dC�LEB7Yw �~��E�ܭ^���5Eט+z��I�|�[T��� -��[(]�!s~�?c�q�)�hP1 -� ��.��d���l* ��+g�G�
-��,���s(��� -l��-�.�7�sլ��CWKo^><���feՌt���C<�>�`�#z���ǧ/1��6UĴ��ڊ���o
�����#��x�}�q
}���{��W@oYЌ��P"�qj�r
����}�p��c.��U@/�qsS�Z��K"��<b�ܩ+
�-�b�U�]�%��0�-6[�K�Ww!�W<'x0ټb���Bw�͓�ͧ/?��3>.�+�%��ݩ�'��\�,:��int�<%#��7����WZ� ��T�Mp|�Q��E� -�U�W����%�m���,���ߨQ)�d���f�`h�U$���v���3���� -Pt���m��ێ��5Z�.&޶� )��l;xm��ӷm���jѽ`@�j��f�����g0�n�}}���Ʀ=Ȯ��f�m8�Ņs��lpb> �u -^��pA�yR��/d����-Gs�?'Q�>R͐�[���sO�!�ȾK��$p#�9�N�|mYQ;�L��k�I���O��n��~ 廭�����v׋�/�P�� -5o6�eco*���^\J�M7s���:�� -��/��z�>���;�b�/5t ��~:˄���:�h�K���Z]:E�s�X��;�R���h��v;:ﶂps�v������ -�涥�}k*طbt�YT��B�ox����F��+���^�!9��X3*;�)����%��c}Q�oL��]} -�˺Fv0�>*V��a�}��mD��,8�+T�OfTvlt*�g��{��Ve�V��}[V��m�>|*4V����>h���j۲j�m�Л�h��
�U/�z|*�v��˂ ��Us���h�?K`��b�T,?���'�T�ObS�Z" -��%2j�Y" -ʋ%2���$� -�mYe ->SKb�gjI���P1v`9�T�v����!���n_J��P�;+hݏ~��pdd)��R��T�}dD��P�7Pn�Mi?*L�U��B���Rn�M�d�J��U=��4*4g�U��F�i��]��-���rˠb���x�T8���^+J�GŁ�ɪ�kR�yMF�]�%�w���]�fj-ђ�21U��}T�\���t)e.�%��j֊��:Ğ~�[Qau�X�:�Tx�׬z��TH�5� �E�Q�u���Bq�В�
�m�`��i�$�{�.a�������N�2�`p�I]�����0�JTV. -���%������@���W�. -�hs�d���K%�p���Ϻ��(�((�W�%D;�z�q����P\�������0L�{ �ƥ�M��Ԕ ��Mkb+�qăK%1��d�}m��@��6.�}Ĥ�Ҁ��L=�(*�bB�@Lh�� �r��V�'��6�J�8TP��'��X*���!���]8T�7�X�S��T�^���ۋ΂O%Z�M4�� �PA�G -�p���3*� -��!��82*��#�!��H*F��~=��]״��${�a��/����$�?��%!�K-���G֏IH������G>� Y��H~�D�� k���ć�&Y�Rk#���+\��<�Δ�ۙ���H~�=-�S_�ﳧet�#���=o$4w�� �������e�����3���e���@@�6�nVs�z�5�X6�*�\e#��6r����s�][bF��i�b���Q��741 ��*�_����o'$�������PK$�M+�-PK
Z�P;ptB�pollen.argoPK
Z�P;1f��^��
Gpollen_DC_Pollen.pgmlPK
Z�P;4�[-m��pollen.todoPK
Z�P;7Rp:B� pollen_profile.profilePK
Z�P;$�M+�- -!pollen.xmiPK1
o9 \ No newline at end of file +z��
z�`�H�-.�-M�{G�S3*<"C}II�(�i��7��rQ#e3eRy�G�$�Rcޑ�R}���y�A��h�+����aT&U`����z�N��j��8���C�qw���
;8b�Z7j�J!D{���y�^v`o;(��Z��+����s����vaF87�1ۜ[f3��C�Kʛ���*����eIJ(�Z���&��b�pږ�o����>쿽�E�h8����[�K`[ڹ��Av��PK-��\��筟�� �}���s�A��^z�2�u�RȞ��pF�X������|��b��wc�N���]�>�5������u/tB�L��O�������̎ۖ�<�PKptB�PK�V<pollen_DC_Pollen.pgml�]mo�F���_�k\�(�pH����, +�ݠM,��,ю�ʢ!�Isq�R29�9�9!�E��M��3g��y�������|�7�e�~s�^z�x=O������?�����^~��������?>��<��~��o��<�H�x��-.���v�Y>�wK6�/g���_���X��7�����l���{��<�wO�������?�t��m�o���ߔ��4�ȟN���
n��^!ߑ ��݅����y�<�u����&�k={��\�����d����]����$O����_�{�W���w���"��� �B�/���q����r��]�o�f�m��vo�d��1�cy���<ƛY�k���w���v����..;�{?m�7��tsM�w�[�V|�K_ϓU�ys���r�?����'/��p��j6�O����ǯ7�ϳ]|���җ��m��n��_�‚�̗�O��8��_~}s��}���r���/����|����v�=�;HOV�`��啿!?�d���Yd#zY bhH{��-����ҷTM(������\]tͲC_������+p0�*#@�(� �d�9�����~f����8��0���]�9����>�x����L�c2I�~�'wɚ��?������l�����|[���d�P����v��)�����<mw˻�|��07�o��_�e��!��w����{������{=;�l7�����Lh`�3����%�XCH�8(Ck�L?����i�+��x8r���{��v�<<�6���n�G���a�)7�)�;��#un�cd��p�ps)�)?����ǻ7l�m����s1��&ٜ�LF��2���C�9�%�2H�Q���Y-���F������\����q[�*'�ꖣ���?�-Gk�����-�w���@�\�M�\�q�
���u
QM_5��y� +�
��S|���r�'?.&�&�qdz�y7��;������Ɏ#�lZv��v�T�1���l��.p�3�q�R1J_�N��� +Cx�yKmC#�ń!�=��r�;��{�)MI���5qlek�bM��α����I&dUI�Ӛ41"x��)@���&�M��9�9�O�Qk��!I+;�b%��I�5�߷��@C�5������#�)7��

����8Ffn�(���:�&&.������c��!ۚX�,|��Y��9U�����@j����t�S�*6]�M7]��*�UL��
`�i��Z��4b2�
R��Y���P?ζ�/��PC�"&��bD{���r�����4����x�q���լ)ڬmH!�ވv��l�\/�ߛ~�sȯ�d�ֵ�5�����$�����쾁��5hS��ǀ��H +hX���h�Р��bB�\ +��_s7��xp������ +�D}ٖp�?�G�lKgg`k�ɀ�F3ދ�E��X�ff d +n3�̠"��C�e`d��0�22�5�\�eH�$�C�#�{(#M���0��F��B�=�6�1�ӝ[[z*Vb�s��ֹu��}�a��AZ� +5�S���8���F0�d"��XM���6��P�D��/� +G�L��}�_Tm�t9n��-��V��9*�(ɤ��G�L3L�������~�3D�9�]*_X \(@c@�E���!-xRs�}=��u��C2�o�����S���o�G8�<��Zęq@CE"�M��X1�h�:�:^/�ꁆ���c ��?�N�[����]|oj
���30�<�@3��d/c��iE�3��h�{�3ӾZ,�V��K3�e�Y� +9G�{ +�l���>$O�?�]|���%���_�� ���%c�����3��n���o�V�F�돚J�gc�n����������돜,�l8r2�e��8kS\p)��FVB{.��<=�%�J��<��E�f��E�V�R�GT�%J�$d�Ee[:{����"����蛩�%J��`�!�$�v��B��0���P�u���qM�)e�H���\Վ��.dQ~Zn����n�K��|B�`�<\[Qw�����Cd��D�vН�-˥� +�jT�#ѧW�b��B�f�� E�u�P����$�P�@�h���ʼnۭg9.U�-]��ۭ|�6Dž(9.�5��r�q�^�k�:�d�(r��/2�E�(�|ɞ=Uc�'�s�1����8C������� /c��]=FȲtJ��=�)ڞ�T��R��jW��&}�j��ch�u���:�ch�À�#�z�Q����1T��0��p$}�c>ěm���c���Ϊs��k�Hk���f�K=�E�IW��(Fz+o1�c���V +{���1(:rp� +D�a�5GUۍ���Z=�� +Q'��cjU�Q �;ٵ�ޡ�K�n��21��T�{���)�q~m���͎��r�r��;�G����ǿ�K���=�ӻ���� +H�J�&_��l��/���������R +��������8�q�o���{��#7��x^�vɗu�����+�I����9��ww�x?`Jp�5�M+�@���n��?����Z� �M�o�;0� ���n��Z��]كu����W�X�M�}����q�Ž#ӯ_D#�5�(_�t$$��G=Lg��;���������rS�ͽr��7S>�r���SA��ʼn@�� +�o��܋ �ϖNO߬�
����x���C���E$Z,�>d�n +��T �I������b�$?-0�l�g�1���Jƣ �؎��v�tH�����Җc@L�:'5��\u�C@�C@Lj:'��d�.���}�.��lw�{1�1>�5�i�պ_kK�f@ǹ�G�;t~�v����-�C
~}X���8?*�~��vsiaOp�i�0w��j���K�+�ӂNwZς>;-]��;�|�6�À>s�-�)����2��\fhb���l�s��gh5W�;���C�d~�o��W�U���L&����������Ǟ�hfS&�6۱L\�d�X&��+��Q+q=�e����l�̠�̦�����z3�w�� +؎b��b6���מ+��;�ii��f�z覞u��p��Ԓ��(~Y��x]��C����6���ё��]��0��:K�Z��։F�,����֯�m�:���2�w<�>E��kH�]%x]��4��+�*�{���>��j��4��yϐ܅��;�}e�M�]�Ve��dP�܈��" +�]F�d��O�i3,�M#�ZL�jz�`N��E���PA&���9�&���F�R�Zd-AM1 {)j%��t�Z����f d +n$�EJ�"=��x��z��ijQ)MMv%Anծ��j�V��f��t����$<x9L�rm��DJš��(
�̐���Y��D��o)k�e���*�U��+�c����Z;Њ(:l8 +r��yk*����qpFj���Y�Z�K���+ߣM^���5�{*τ:1�J�����@��V!���s�>ͲYMS�js��RN��Cu{YU€�F��>��Bp�$*���5'�%�(��`':}y��� +�܀}�*�_�&�6R�Ys����{1 X6�u��MIH�hFpf�q�fx6�L�=+ܯS"!B%��C*�����q��"dM%�M����qK�L�*z�dS��� +�0{$=��0c��?ʄ����/ꄒ3 � 3�3�L�ϋ�YQ�r�J���);�8�)���ŵ%Y��ָ��� +�8�a�]���,J� -G�d!��-�!�ԪF��q^p�q:���;NV ��A-��ץH�=�0v�WY�Z��<��G\c*���!k��F5��D4�̌a�c��;��C/ʃ6N�-��@gh!��3���[�jz�b]j~!\��`���nԦj"�lr�)]d�[]�u��K����'��l�<0(NB�zU�լ|��4�.�����f�h���{�ar�]M������r&®���X��+R��(����� +��1�+ +��${�qd/��l����=��������@�����^�E�N��H��3<�##�k���q��!T�� +��J-ď���^��Dm\)]o�&mΨfi���
�l +'s���=.��n%u�GT�R�*GV������ڮ�D�fT�d��S\p�S���LJ
2GR���L����&�cJ�)]�!Ւ+��!ժ+�{JׇM�����J;�YS�9�у��W�i�ɵ�b�N���\ �n�9�.?Q��T��:�t9�RL���֥[̓�,ϩ��C�a�E��>�����tI��A�g�~��L��ݜ���.G��V�E�ҥ�V�
T=v�O_��9?��tQ5�KF�@ +PF��P�k~�_�8�����}��G�����XӜ!��qVYg����:���{�g���sŜk�����п�����ˇFhz�#��
�=�t܇x�)Y����鸴��kAm1��Y'wS�~Z��R�`�9��_fz��#�Et;cs~�#aһ����\�����.���f����u.7#,M�9���[��e�
����u)�W��R{ղ�4�RJ�)���P�q�����J�~IJ��HQ�^�F�.���y>&�39�V����J�z�x��t=_��e��1�pT����z~�tt��w����Δ[�ut߮���kސ����+{��6�Z�4�ʽ�5�k^�^�X�������QH_��9g�c�z�a]�^#�K���]�Aa(v��悭rh���
�qh����D�X�\O,%H�Di>�"Q���M������}R꽘�w +�Y?��O��d��i�s���*|�[BUP�hi�3.��r�3���e�=�PX�d���<f�]�E����u,����X(b�Hz �����X�A����X%��H�����!�UZ�*�+Reލ����>[�n��E��� ��3��:M��&T��AZ��óϔJv�s�*�+T������~��*e�!��.���n�[�Ī���*}T�7d<�#���
��r���^��|dP=���zc�V��|�i�0�6P�=�}�S�E��:Y}H��GNU���"� +�E�0��Z�/���F:��*�L��$��E�;R�\!t��N��,�U�;���K�l���Y�~�m\Bg[�b�ok���%t�sN�_��-��?' +���yg���'�a��R�]@3t=���b +Y@�U4 �X��r���M��?����E���)<��LM"��(�ˇ�'۴�h_5���M����Y�׬}�˪���91r���:�~�
ώ�ez�h�U����Y�׎ɿ��3֙v�,�k����.Ʀ�/r��Ѩ�/oL�ЅE:�e���BJ�0=p[Xx���,P�Ho��i�aW�fݰ��+:w��*���9�x��\C��e�t�c�c:g#�)j���\3� +Z�[�s��9��[�z�=��<�$Bfs��c��iج�x�],������^L�}��4猰�Zt43��i�J0*�����h��+�yA� �T������T��8z��{H���j=��@v�F�C�R�I�
����v�u��8��&e?��V�H��~�����*8�v�s�΍3����qŻ����"Z��R|����D��Az��]Zy=��`���t�q�G�n����۷��� +q�)]:� +��6�v����z�U����p�ͮ3$q�Iݮ�jCL�O�4��ϐ&5H�ݮ�Hp���S��(�����n�@�� n�f��#�8��4ċ����NwA��Nr�DͩAԴ�ϛQ/��
�M��Ȃ�:lz�A�|���o;��?��uYp�1jj����)v=jJՃnJ��((�JɁ=6jn�BP���0�M��o�&؞��m0C���1F�4���w�VH��C�E�;
]�s��|�a۽�0��,YNM<�v=�I�x���P6
� g5�I����<��l�$�hfم ����B��L���$O\i�����43���޽A�ܺqo��W�Д�S�A��>n�c�+�����Q\
���-��Lb9��m5 +x�)�Ly�����[�o�̪�F*[�Un5b��-��́���b1�SŬ�r����\�!���,i,'eY&�MQ�<�% +P�(��q�'[*���� +P��@a;�T
1��*@kU
�"��[�Ph�*��I�!ԣ~T��T� +0e��C�� +�'~�~G� �3h
��΍`W�[kZ� @�[ȹ���~P�C��ը<�9+�-�=�&�C���4�B��V�&hfVm5���zM f��@�:E�M��\��@�Ql;��wt�ϳ��[���yH!�K�Y/��>ž֍���������<fa����>�^�}���I
<[ާ���O��[���{��i90G��~ާ���O������]����R��Mi��~S~��7�����=m��]u�,ѣ�~���fn� +��]u�.� +��]��KM@G^�Gh�� 6
��]" `�m@�:
��%����,�������v�箋��E>G��s���ٞ�� +N���\0l6w +���@���#�k��u2�����'s�H��o���&��qEo�0��?�r32w�Lbd�X�6��Z6W�mH�ܝG|~:wcpf�O��G��gۍ���F��B��g�
��霻��1��x�}:����M��t�����YJa:��gu���Ҧs��%������*ju,������G���$xrP���L��ZJ٭��-��Zv�Z/���L��j���Zϧc��٪�"M����j=�V��z�j�B{׆CW\[kDQm�G�ȵ����h(�z�j4, *�b^���V�ɀ�Z]�G�[�j��KW��V+ߢ�Ջjk��p��;C�^���;�(�^�)��v4�_��]E��%�Q8\����j��`��R��w�?�P��p��1˪��"��kozs�I�����J6Yb�)O�9���w�j��O�����pq~�}��^�k�π�}ڰ�N~g�б�F!���
Y���l +Ń[��9��%>�z��YU�u>:��H��1��ua�͡��9���N�!��L�q�3PA�>�C}'r6����<�"fU9���D����)��iN�h���4X�E<��+�����6�!H��9@5�ѹ�
�yz�����U����G�z4D�h�;��&=�z�5�N�z4L�h�;��&=�z�5�M��ѡ�̫(�#�����x��PճѼN�+���eSg�v?:���!#͋:�@�H���u�GF�u�q����5\�4�|�4/��k@����h^�9y�yW���h�q}�p�����]u��#ͻ�"NKG��p +��<:Ҽ�."�t�y +��6ͣ�&����V,J�܌�Y�|t�Ei��i�&���Uf�5%z}�day����^�f  +���^O� �q +���B:���h�}���yHg\�D���H�)[�3�(� z��iw- +��ߺX]~��PK�[��
PK �V<pollen.todo�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��q�(��;�D�*���+G���*(�8z)%)J +@% ���,.
2���E���9e�)�E�%��� Y,B3PK4�[-m�PK �V<pollen_profile.profile�����Q(K-*���S�UP2�3PRH�K�O��K ����Z()��qq��e��q��ÙPK7Rp:BPK �V< +pollen.xmi�]��6��޿�(�����1h��-{Q� �&�ݯ�D9��Y�&��J��cY�,r� %��mb���!�;�s��?�=�g�0:�a0�u� .������]���_�s�a���?����;=��Bs�!�l���{�I���n�6�<�ɗ��O���C��C�-�g�4�GU{��z�e& ������,���W\���^���� 1��V�o�C�I�e�SZ~:�!|�� +Ap����_�'M.�M��/� +�Q��������������,��������@�}.�sQ� �c�������O�A������{����?f�_� ���W��f4=�����������������Gq������M/,�9�A����I�����n:3sM�� +c.��(Hs]�mG���(BO�M�y����Q�~V���¾���U����<����t|�w�A��{`��7�a\��w��^^���1��s��2c��l�0��"�t����4��� +bܦ�]�%۔<�Q�DC��
1j����gՃ|�薈�bp&4�P������%��C��kz~�g���A�|�����]���ERJ�_��]�I�F��%��
t_����'����T��]��#Ρ' �k$��SmSq<�eu=��BNQ��F�iq����N���C��ɞr`�/,�;��v�7�ȥ�z�G�:O�"��`� ���6e�u��7��C�ݯ�Y +�t� &������駇����m��FlI?tb��9uaBa�%����_.�?_7��r����&k*]O�`8���,�� +��R��Iz�Ä�0Zxħ���eG�}�ћ`� �P3��b���d���t\�x�_��N�i�� �;� ��M���+v��<�`��&�����9r����$<��w���>� ���Q��Es���4��!j���j���G���.Q�?���DoJ_�0;��K+�B�;�A�[#���dV�
���t�FM����tm5ы$I5���&J/Uc�fTՀ*��]aw��Wu�߅G'����0���5�0`q��0:�d�5m�9�j� +�P<�t����OL��kx,]��x�!�?8�V=���{��U��,ƭZB���x�W��؍��X���g�dF[�*�|��1����ǘ��ј����@�ڛ\�x�-�������<��T��&БJ�ȅы�>�3tQ�v��.o F�� +�J�-2�==[5E�ց�-O��EqY��0zvs���� rs*Q�Q�t8�[�d�S���=�X��:I�C�GOH��8RT��������J"S�L�TOV�� m}�@�R)���>��ԦF�h��e��B���7�w_ t� ���H��/#�L�ps�-���9Z+ͷ�Wp�+�U�K��D��Cڣ��
`L��[o�Ë`qi��H��<r�g��# +��Z-]npFwe7E�4O4=ɵM�i�WCL$wx�t��4��y��H��88Vt�}������^�BҴ�u�+T�4UGCbŲW�8�/�����h�Y,:7yqxJ��K�>�B�M^a�� +�2�}T��TO?&@WSL�"�L�Hޔ�t75�V�=��#Ev��)h��9��!<��89E`A�cĹH��䰕��0@��>���-$�B��W�4~��Բ��F�++�����HG��WM���v�ōHF�@�+i#R�HWR0s=�]��A��L��Y��x�jgUyQ$A��YZFh�8�)��Q�V)Z}�"9��ʩ�X�0� +�׵�F�y��p�!)_�,8BJ#�9R�0�bX�� +L���Ql�&NHXj +�٘>�;"80�5dd�[� ���")O�Lq$���uɑ�R$��IRg�%�W�E� +,�s-�um.�$�^V�L4M rַ�����|O�87�&R��k���)COqT'[��*�c ������s���Q}3�9�H'b�px����}�:�@�jݑ��R�5bڝb��a�‚��8D�p(t`Md��4��9�S +`�"����I �+t��xC�(ۢ-:JB�,��

�Ƞ#�.�A| +O��
1cL@hN$w$:��Rׇ�U�!ğG�p6��I�RjH�"��}��'[?)��������$�
̘��Cš��h��kx,]QȈ����<�ݝ����=?:�'�@�����c�ɅS��|��7�yJ��*Od)t'4>X0�e�.^d����'��8�>�^ج� +J=ȍ�@��L���W�][�
2�}�߫.�N`�u
�n�A���q(t�&�|5 �b�l6b~�Y���>�K��h�wq�LbO�J�I9f�
��L�cc����f{�;�k��T(w��]����b���o՞���B��V�O�,~rT�0JЀ)]�V�l��$T1tIґ�pr���+ +O�8���.
}#�wY����cf�I��~��sb��q���Uj�ƛe��@���e7&�a +j��*���)ZOWb3��j�D��#� E�R*\�>,�A�p9�ҟή %A�p<x�r�as�@t�lB�MED�:ې$4���<$�� '$�u�;]p�4�mY���m��[��E�������]�ޜF�P���}\a��S>s&��pzAcY��c�[��t!pl'�[�� +� e�'I�-y��!7�:䅻����n +Xs"RU�f[��^��Ϟh={"�\1jϝ�|�09:P�����B�dE�P[/5�c�p�I�@�R�ȫ�:Lj�\xt"���oXl�=w���#��۳F�x�䦱H�
��h:�����>��e�����w�n�@�� (�b���77&}�?�:`
7"��n� +Dx0����}V�%��W�-t�h��VDž�˱���}�%���-t�L֑��r���-���t����݅�ѹ���1� +0tt:���.���S�K'��P�1����:�(���N�6���t���.����ǂ���xK�m�KJP�0",��[����H�ǎ�zP*ҙk� .�.�WpO�y�g�
1�<ʠ�aD�@$*��d~�ۘ��]A@�*�
�A�H��k��lfU�]*.R*����%�8���:��B�� �$r8(t\I�*���A�]M�l$͢T{���A��D) �� +D���$
�@~�P�0:0H��"P +���f%�[�ltBsm�+�o�<�f@��>�^�+^:�W@S�e���/ɫ0:�����_��B +kc�U{O+�t����ڜ@~Gk�k�+��q.�#Y���"���/�ܞ#�:|J�Z�E>�s-�r-�rS�\/��4E���M���os>�A��!*�b� +�B�G�����!���@�LUC���?9���7��u����i�K�S�:,����ϛ� +�C�x�5Ir��,qǒ�X�$ˊ#Rͺ�� �:������&p[�K�9O��$Z�G���R��Զ�>��\��.ms +���!g`������ j��+w`���f��_LI5ǜI��@' ��0���J�a�P=�Î�<��CR�.6�0 ���h>�͢M�+(�s,�8T�KJm*u�R��:�]�%�sCoR��V㈆��jo+4į� �>%���
�yAgWvS#*���$�6���Z�i��D�Hٜ?\{����h�߈@��:h4�f�4l��F}c"�%O[E#�g�"�ڙVr2]���~��w�}oDA^u]��������x�p D6+�6mT�����sg�r���#�RB"�%u � +$��+c���#�J�L���Ǐ��ܜnvU�oJ3�W�HÂ)R�ȇ����~��^mC�8�E������|tkl%5-� +m;s��^�[�>�C�TT�%h�y�'� +�����r��7���V� +�-l�jj�D���+���A�Nܝ�Ny��櫦��:3o��i�᢮�H�2C!-ȺOiɥOy�5���G�QIHMȆ���렳k#�y}\~ A0 dļg1����D¢2��\��K28.*�,K���lǶUS�PF�(�o���]ߜ@^���a���nf�|β�I/�Б������ ��0p¦!�y��]�d=_C*iZ�:�| +����� +w�e�>�N�y�6��vpQ*Zz�����|��͖��1��͖�<�ګe�UX[W���I̥6�1h�x�N�Bi-6,�R��7��,؆+�g�ΔM�uP��V2���Ne!��+h+d)N����j1j�'��j�b6QŬ�RT#R̈6a�&��Y��UȰ����U%[�l�ɨdkd?�hg����@��0����d���z�(aЎ����(1Ye�&�9�T&�| +�{��Jr����.�G!c�s�����o�/t�QȨ���=�4��$j��H��$kt�.͇N_��8�q�KNlI
dR��6�.pbÃ[�J�(A{� ��?C�q��Ӡb"�]]vm�F��ٔWƚ����e-�O�-^��i��\���r�����X�(\��*F�n�#��x�]���G�jeS�3%^.<�
[<���ꉉDjk����o8�����ƑD<�.R�������^�� +�-��PJ4N-P.���lj��8��z�zُ{���2��^�p���Y>��7;p
}^a� �i h��t����R��(d����&�W,x�W����yR�����Dt���4��}I{mwn� 8�
�3��d��F�]�0O�H��M"�����̀68�s*K��y: +��F/��'eh��67��v����ը[�M�sSX04ہ*���z�A��F���5Pz���m�������qo�ӄ��Ma�������&ӂhy��^0�Z5�Y3Q����3�u�߃�.F^y�����3�&��¥�m�71��:9/Va�� h=�����o�|o�#�9џ㨋k�fH���Vx��'Đrd�5C~b���i�r��,����ɕޤS��'�H��e��������z�Et��U]��(�x��7WE�*���^\ +��n`{��[��v�;���H�U�gv�;����n�i�{�T���*3D3t ��~>����:�h�M����;�R�߱���D;���y�����G�è�^vv8T�w�-���BK����п�,*�gѢ��� +�����bs��W]Hl*֌ʎu;4�oɦ�X_�:�}kFW�E�沮�����gme�UU�
�W,�7���r� +�Ɍʎ�N�Vw/��½L?��" +�۲�7o�p��S��ʾ.N7�@��`VۖU�mK�޼E[m��:���S��;��_�9<�����G�Y�^K�b���.?Q�����i0�,�Q��iP^,�Q��% T�o�*�h�Z�>SK�.0 +�����)�BxH�c]h� +��t_�R�?� +�YA�~���##K���Ϥ�}�##�-� +��r�mJ+�Qaz(��]ܦ�r�mJ'�T*D��艥�Q�9k��]4*�Oc��b�p^n���[��`5�ä��g��ZQ�>*<LV�^���k2�b-�ؼKV70Sk���׉����岼�K)��p�,�T�VT���!��cߊ +�cŪձ��[�f�[��B�M�,*�ʭ�5p(e������oC�N�'��#� {D�x$4��AD�+Mj�@��T%�A�U���*pi�Ħ�-�ׅ/�J��5����pi�D��%��B�[J*�Vu�u[�Q�QP��"K�v�u��K%��dwh�K%a�dw܍K�Xת)AH���V���JbB1�V�8�ƥ���m\���I��
]m�z�Q &T6ńJ���(���[�,ON%.l•�b
p���o�Oxw�8TP�Cxw�p�@oޡr�0(W�ؽ*����� +J���h�Aơ��6�zw�g8TP�Cxwqd8TPG�Cxw�<8T���z>/��i�IH�d�0�E_�-�)sI~`iKBr�Z2���������|XA@��&�����Q�$$w �����kL�Ԧ�F��CW�$�y��)��3[�ˑ�>{ZF��8��gO�h��F��C{�Hhn��A��C� $��ͼ�߿�gP�3����8���dm`ݬ��zk +��l�U�1��3m�2�g�S��)��Ĕf��4�pQ�� �ohb0�U�W�@:�LE�ޣ(i��ɪb��D�՛,�����lO�qj4���[������ݿ?��p� �A������/PK'w_)�r2PK
�V<ptB�pollen.argoPK
�V<�[��
Gpollen_DC_Pollen.pgmlPK
 �V<4�[-m��pollen.todoPK
 �V<7Rp:B� pollen_profile.profilePK
 �V<'w_)�r2 + !pollen.xmiPK1
�9 \ No newline at end of file Modified: trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java =================================================================== --- trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-business/src/test/java/org/chorem/pollen/business/services/ServicePollImplTest.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -34,9 +34,13 @@ import org.chorem.pollen.common.VoteCountingType; import org.junit.After; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; /** * Tests du service de gestion des sondages. @@ -45,7 +49,7 @@ * @version $Id$ */ public class ServicePollImplTest { - private ServicePollImpl instance; + private ServicePollImpl instance = new ServicePollImpl(); /** log. */ private static final Log log = LogFactory.getLog(ServicePollImplTest.class); @@ -65,7 +69,6 @@ @Before public void setUp() { - instance = new ServicePollImpl(); } @After @@ -76,7 +79,8 @@ * Test of createPoll method, of class ServicePollImpl. */ @Test - public void testCreatePoll() { + public void testCreatePoll() throws TopiaException { + log.info("### START ###"); PollDTO dto = new PollDTO(); dto.setBeginChoiceDate(new Date()); dto.setBeginDate(new Date()); @@ -96,7 +100,23 @@ if (log.isDebugEnabled()) { log.debug("result: " + result); } - assertTrue(result.length() > 0); + Assert.assertNotNull(result); + + TopiaContext transaction = null; + try { + transaction = ContextUtil.getInstance().getContext().beginTransaction(); + + TopiaEntity entity = transaction.findByTopiaId(result); + Assert.assertNotNull(entity); + } catch (TopiaException eee) { + if (transaction != null) { + transaction.rollbackTransaction(); + } + } finally { + if (transaction != null) { + transaction.closeContext(); + } + } } /** @@ -104,12 +124,16 @@ */ @Test public void testUpdatePoll() { + log.info("### START ###"); String pollId = ""; PollDTO dto = new PollDTO(); dto.setDescription("Test_updatePoll"); dto.setTitle("Test_updatePoll"); dto.setCreatorId("erwan"); dto.setAnonymous(false); + dto.setPollType(PollType.FREE); + dto.setChoiceType(ChoiceType.TEXT); + dto.setVoteCounting(VoteCountingType.NORMAL); pollId = instance.createPoll(dto); dto.setId(pollId); dto.setDescription("new description"); @@ -122,10 +146,14 @@ */ @Test public void testDeletePoll() { + log.info("### START ###"); PollDTO dto = new PollDTO(); dto.setDescription("Test_deletePoll"); dto.setCreatorId("erwan"); dto.setAnonymous(false); + dto.setPollType(PollType.FREE); + dto.setChoiceType(ChoiceType.TEXT); + dto.setVoteCounting(VoteCountingType.NORMAL); String pollId = instance.createPoll(dto); boolean result = instance.deletePoll(pollId); assertTrue(result); @@ -136,11 +164,15 @@ */ @Test public void testFindPollById() { + log.info("### START ###"); String pollId = ""; PollDTO dto = new PollDTO(); dto.setDescription("Test_findPollById"); dto.setTitle("Test_findPollById"); dto.setAnonymous(false); + dto.setPollType(PollType.FREE); + dto.setChoiceType(ChoiceType.TEXT); + dto.setVoteCounting(VoteCountingType.NORMAL); pollId = instance.createPoll(dto); PollDTO result = instance.findPollById(pollId); assertEquals(pollId, result.getId()); @@ -151,14 +183,20 @@ */ @Test public void testFindPollByPollId() { + log.info("### START ###"); String pollId = ""; PollDTO dto = new PollDTO(); dto.setDescription("Test_findPollByPollId"); dto.setTitle("Test_findPollByPollId"); dto.setAnonymous(false); + dto.setPollType(PollType.FREE); + dto.setChoiceType(ChoiceType.TEXT); + dto.setVoteCounting(VoteCountingType.NORMAL); pollId = instance.createPoll(dto); String pollUID = instance.findPollById(pollId).getPollId(); + log.debug("pollUID : " + pollUID); PollDTO result = instance.findPollByPollId(pollUID); + log.debug("title : " + result.getTitle()); assertEquals(pollId, result.getId()); } @@ -167,10 +205,14 @@ */ @Test public void testFindPollsByName() { + log.info("### START ###"); PollDTO dto = new PollDTO(); dto.setDescription("Test_findPollsByName"); dto.setCreatorId("erwan"); dto.setAnonymous(false); + dto.setPollType(PollType.FREE); + dto.setChoiceType(ChoiceType.TEXT); + dto.setVoteCounting(VoteCountingType.NORMAL); dto.setTitle("Test_findPollsByName"); String pollId = instance.createPoll(dto); List<PollDTO> result = instance.findPollsByName("Test_findPollsByName"); @@ -182,6 +224,7 @@ */ @Test public void testFindPollsByUser() { + log.info("### START ###"); // création de l'utilisateur UserDTO user = new UserDTO(); @@ -194,6 +237,9 @@ PollDTO poll = new PollDTO(); poll.setTitle("Test_findPollsByUser"); poll.setUserId(userId); + poll.setPollType(PollType.FREE); + poll.setChoiceType(ChoiceType.TEXT); + poll.setVoteCounting(VoteCountingType.NORMAL); String pollId = instance.createPoll(poll); // recherche des sondages de l'utilisateur @@ -206,6 +252,7 @@ */ @Test public void testFindParticipatedPolls() { + log.info("### START ###"); // création de l'utilisateur UserDTO user = new UserDTO(); @@ -223,6 +270,9 @@ // création du sondage PollDTO poll = new PollDTO(); poll.setTitle("Test_findParticipatedPolls"); + poll.setPollType(PollType.FREE); + poll.setChoiceType(ChoiceType.TEXT); + poll.setVoteCounting(VoteCountingType.NORMAL); String pollId = instance.createPoll(poll); // création du vote @@ -240,29 +290,42 @@ */ @Test public void testFindRunningPolls() { + log.info("### START ###"); Date now = new Date(); // sondage en cours sans date de fin PollDTO poll1 = new PollDTO(); poll1.setTitle("Test_findRunningPolls1"); + poll1.setPollType(PollType.FREE); + poll1.setChoiceType(ChoiceType.TEXT); + poll1.setVoteCounting(VoteCountingType.NORMAL); instance.createPoll(poll1); // sondage en cours PollDTO poll2 = new PollDTO(); poll2.setTitle("Test_findRunningPolls2"); poll2.setEndDate(new Date(now.getTime() + 100000)); + poll2.setPollType(PollType.FREE); + poll2.setChoiceType(ChoiceType.TEXT); + poll2.setVoteCounting(VoteCountingType.NORMAL); instance.createPoll(poll2); // sondage terminé PollDTO poll3 = new PollDTO(); poll3.setTitle("Test_findRunningPolls3"); poll3.setEndDate(new Date(now.getTime() - 100000)); + poll3.setPollType(PollType.FREE); + poll3.setChoiceType(ChoiceType.TEXT); + poll3.setVoteCounting(VoteCountingType.NORMAL); instance.createPoll(poll3); // sondage pas commencé PollDTO poll4 = new PollDTO(); poll4.setTitle("Test_findRunningPolls4"); poll4.setBeginDate(new Date(now.getTime() + 100000)); + poll4.setPollType(PollType.FREE); + poll4.setChoiceType(ChoiceType.TEXT); + poll4.setVoteCounting(VoteCountingType.NORMAL); instance.createPoll(poll4); List<PollDTO> result1 = instance.findRunningPolls(true); @@ -276,10 +339,14 @@ */ @Test public void testSelectPolls() { + log.info("### START ###"); PollDTO dto = new PollDTO(); dto.setDescription("test selectPolls"); dto.setTitle("selectPolls"); dto.setAnonymous(false); + dto.setPollType(PollType.FREE); + dto.setChoiceType(ChoiceType.TEXT); + dto.setVoteCounting(VoteCountingType.NORMAL); String pollId = instance.createPoll(dto); List<PollDTO> result = instance.selectPolls(null); assertTrue(result.size() > 0); Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java 2010-02-21 10:31:16 UTC (rev 2875) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/pages/poll/PollModification.java 2010-02-22 21:16:44 UTC (rev 2876) @@ -455,7 +455,7 @@ /** Retourne le poids en entier de la liste courante */ public int getWeightAsInt() { - return (int) votingList.getWeight(); + return votingList.getWeight().intValue(); } /** Retourne le numéro de la liste courante (index+1) */